rpms/fonts-chinese/devel fonts-chinese.spec,1.38,1.39

[Caius Chance (cchance)]

Author: cchance

Update of /cvs/pkgs/rpms/fonts-chinese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1408

Modified Files:
	fonts-chinese.spec 
Log Message:
* Thu Aug 16 2007 Caius Chance <cchance at redhat.com> - 3.03-6.fc8
- Resolves: rhbz#252269 (Drop chkfontpath dependency.)




Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- fonts-chinese.spec	3 Aug 2007 01:41:05 -0000	1.38
+++ fonts-chinese.spec	16 Aug 2007 05:30:02 -0000	1.39
@@ -2,6 +2,7 @@
 %define ttfontdir      %{basefontdir}/TrueType
 %define miscfontdir    %{basefontdir}/misc
 %define cidmapdir      %{_sysconfdir}/ghostscript
+%define catalogue      /etc/X11/fontpath.d
 
 %define ver 0.1
 %define minor 20060928
@@ -10,7 +11,7 @@
 Summary:      Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:         fonts-chinese
 Version:      3.03
-Release:      5.2%{?dist}
+Release:      6%{?dist}
 License:      Arphic Public License (GPL-like)
 Group:        User Interface/X
 BuildArch:    noarch
@@ -31,8 +32,8 @@
 Source24:    CIDFnmap.zh_TW
 Source25:    CIDFnmap.zh_CN
 
-Requires(post):      ttmkfdir >= 3.0.6, xorg-x11-font-utils, fontconfig, %{_sbindir}/chkfontpath
-Requires(postun):    fontconfig, %{_sbindir}/chkfontpath
+Requires(post):      ttmkfdir >= 3.0.6, xorg-x11-font-utils, fontconfig
+Requires(postun):    fontconfig
 BuildRequires:       xorg-x11-font-utils
 Obsoletes:           ttfonts-zh_CN ttfonts-zh_TW ttf-moe_sung ttf-moe_kai ttf-arphic_bming ttf-arphic_bkai taipeifonts
 
@@ -60,14 +61,14 @@
 install -d $RPM_BUILD_ROOT%{miscfontdir}
 install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType
 install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType
+install -d $RPM_BUILD_ROOT%{catalogue}/chinese
 install -m 0644 ttf-arphic-ukai-%{ver}.%{minor}/ukai.ttf $RPM_BUILD_ROOT%{ttfontdir}/
 install -m 0644 ttf-arphic-uming-%{ver}.%{minor}/uming.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-install -m 644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 644 taipeifonts-%{taipeiver}/taipei20.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 644 taipeifonts-%{taipeiver}/taipei16.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 644 taipeifonts-%{taipeiver}/vga12x24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{miscfontdir}/fonts.alias
-
+install -m 0644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
+install -m 0644 taipeifonts-%{taipeiver}/taipei20.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
+install -m 0644 taipeifonts-%{taipeiver}/taipei16.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
+install -m 0644 taipeifonts-%{taipeiver}/vga12x24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
+install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{miscfontdir}/fonts.alias
 
 # for ghostscript
 install -d $RPM_BUILD_ROOT%{cidmapdir}/
@@ -92,6 +93,9 @@
 touch $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
 touch $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
+# Install catalogue symlink
+ln -sf %{ttfontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-chinese
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -104,7 +108,6 @@
         touch $tmpfontdir 2> /dev/null && {
             %{_bindir}/ttmkfdir -d $tmpfontdir -o $tmpfontdir/fonts.scale
             mkfontdir $tmpfontdir
-            %{_sbindir}/chkfontpath -q -a $tmpfontdir
         }
     done
 
@@ -123,8 +126,6 @@
 if [ "$1" = 0 ];
 then
     umask 133
-    %{_sbindir}/chkfontpath -q -r %{ttfontdir}
-    %{_sbindir}/chkfontpath -q -r %{miscfontdir}
 
     #Update fontconfig cache
     if [ -x %{_bindir}/fc-cache ]; then
@@ -161,9 +162,13 @@
 %{cidmapdir}/cidfmap.zh_CN
 %{cidmapdir}/CIDFnmap.zh_TW
 %{cidmapdir}/CIDFnmap.zh_CN
+%{catalogue}/fonts-chinese
 
 
 %changelog
+* Thu Aug 16 2007 Caius Chance <cchance at redhat.com> - 3.03-6.fc8
+- Resolves: rhbz#252269 (Drop chkfontpath dependency.)
+
 * Fri Aug 03 2007 Caius Chance <cchance at redhat.com> - 3.03-5.2.fc8
 - Updates font postinstallation updation procedure (fc-cache):
   http://fedoraproject.org/wiki/Packaging/ScriptletSnippets#head-4863fc4c93cec14292719d8901d83f5d90c3e477