Author: tagoh
Update of /cvs/pkgs/rpms/jisksp16-1990-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1138
Modified Files: jisksp16-1990-fonts.spec Log Message:
Index: jisksp16-1990-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/jisksp16-1990-fonts/devel/jisksp16-1990-fonts.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jisksp16-1990-fonts.spec 26 Mar 2009 09:15:54 -0000 1.3 +++ jisksp16-1990-fonts.spec 26 Mar 2009 09:29:05 -0000 1.4 @@ -1,5 +1,4 @@ %define fontname jisksp16-1990 -%define fontdir %{_datadir}/fonts/%{fontname} %define catalogue %{_sysconfdir}/X11/fontpath.d
Name: %{fontname}-fonts @@ -8,13 +7,15 @@ Summary: 16x16 JIS X 0212:1990 Bitmap font Group: User Interface/X License: Public Domain + URL: http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/ Source0: http://kanji.zinbun.kyoto-u.ac.jp/~yasuoka/ftp/fonts/jisksp16-1990.bdf.Z
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: gzip mkfontdir xorg-x11-font-utils fontpackages-devel
-BuildRequires: gzip mkfontdir xorg-x11-font-utils +Requires: fontpackages-filesystem Conflicts: fonts-japanese <= 0.20061016-11.fc8 Provides: jisksp16-1990 = 0.1-16 Obsoletes: jisksp16-1990 <= 0.1-16 @@ -35,25 +36,23 @@ %install rm -rf $RPM_BUILD_ROOT
-install -m 0755 -d $RPM_BUILD_ROOT%{fontdir} +install -m 0755 -d $RPM_BUILD_ROOT%{_fontdir} install -m 0755 -d $RPM_BUILD_ROOT%{catalogue}
-install -m 0644 -p jisksp16-1990.pcf.gz $RPM_BUILD_ROOT%{fontdir}/ +install -m 0644 -p jisksp16-1990.pcf.gz $RPM_BUILD_ROOT%{_fontdir}/
-%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{fontdir} +%{_bindir}/mkfontdir $RPM_BUILD_ROOT%{_fontdir}
# Install catalogue symlink -ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name} +ln -sf %{_fontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
%clean rm -rf $RPM_BUILD_ROOT
-%files -%defattr(0644, root, root, 0755) -%dir %{fontdir} -%{fontdir}/jisksp16-1990.pcf.gz -%verify(not md5 size mtime) %{fontdir}/fonts.dir +%_font_pkg jisksp16-1990.pcf.gz + +%verify(not md5 size mtime) %{_fontdir}/fonts.dir %{catalogue}/*
%changelog
fonts-bugs@lists.fedoraproject.org