rpms/fonts-chinese/devel fonts-chinese.spec,1.31,1.32

[Caius Chance (cchance)]

Author: cchance

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

Modified Files:
	fonts-chinese.spec 
Log Message:
* Thu Jul 26 2007 Caius Chance <cchance at redhat.com> - 3.03-5.fc7
- Resolves: rhbz#249644 fc-cache is not always caching newly installed fonts
　　　　　　in fonts-chinese.
- Refactorizes .spec file.



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fonts-chinese.spec	1 Feb 2007 07:57:10 -0000	1.31
+++ fonts-chinese.spec	26 Jul 2007 07:18:39 -0000	1.32
@@ -1,47 +1,40 @@
-%define	basefontdir	%{_datadir}/fonts/chinese
-%define	ttfontdir	%{basefontdir}/TrueType
-%define	miscfontdir	%{basefontdir}/misc
-%define cidmapdir   %{_sysconfdir}/ghostscript
+%define	basefontdir    %{_datadir}/fonts/chinese
+%define	ttfontdir      %{basefontdir}/TrueType
+%define	miscfontdir    %{basefontdir}/misc
+%define cidmapdir      %{_sysconfdir}/ghostscript
 
 %define ver 0.1
 %define minor 20060928
-%define rhpatch ''
 %define taipeiver 1.2
 
-Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
-Name:		fonts-chinese
-Version:    3.03
-Release:	4%{?dist}
-License:	Arphic Public License (GPL-like)
-Group:		User Interface/X
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-#Source:     http://apt.debian.org.tw/pool/t/ttf-arphic-uming/ttf-arphic-uming_%{ver}-%{beta}.tar.gz
-#Source1:    http://apt.debian.org.tw/pool/t/ttf-arphic-ukai/ttf-arphic-ukai_%{ver}-%{beta}.tar.gz
-Source2:    taipeifonts-%{taipeiver}.tar.gz
-# Revert to the following 2 lines when first patch is needed to be introduced.
-#Source3:    ttf-arphic-uming_%{ver}.%{minor}.%{rhpatch}.tar.gz
-#Source4:    ttf-arphic-ukai_%{ver}.%{minor}.%{rhpatch}.tar.gz
-Source3:    ttf-arphic-uming_%{ver}.%{minor}.orig.tar.gz
-Source4:    ttf-arphic-ukai_%{ver}.%{minor}.orig.tar.gz
-Source9:    taipeifonts.alias
-Source10:	arphicpl.txt
-Source11:	arphicpl-big5.txt
-Source12:	arphicpl-gb.txt
-Source13:	arphic-release.txt
-Source20:	FAPIcidfmap.zh_TW
-Source21:	FAPIcidfmap.zh_CN
-Source22:	cidfmap.zh_TW
-Source23:	cidfmap.zh_CN
-Source24:       CIDFnmap.zh_TW
-Source25:       CIDFnmap.zh_CN
-
-Requires(post): ttmkfdir >= 3.0.6, xorg-x11-font-utils, fontconfig, /usr/sbin/chkfontpath
-Requires(postun): fontconfig, /usr/sbin/chkfontpath
-# bz226716: needs bcftopcf in xorg-x11-font-utils pkg.
-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
+Summary:      Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
+Name:         fonts-chinese
+Version:      3.03
+Release:      5%{?dist}
+License:      Arphic Public License (GPL-like)
+Group:        User Interface/X
+BuildArch:    noarch
+BuildRoot:    %{_tmppath}/%{name}-%{version}-root
+
+Source2:     taipeifonts-%{taipeiver}.tar.gz
+Source3:     ttf-arphic-uming_%{ver}.%{minor}.orig.tar.gz
+Source4:     ttf-arphic-ukai_%{ver}.%{minor}.orig.tar.gz
+Source9:     taipeifonts.alias
+Source10:    arphicpl.txt
+Source11:    arphicpl-big5.txt
+Source12:    arphicpl-gb.txt
+Source13:    arphic-release.txt
+Source20:    FAPIcidfmap.zh_TW
+Source21:    FAPIcidfmap.zh_CN
+Source22:    cidfmap.zh_TW
+Source23:    cidfmap.zh_CN
+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
+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
 
 %description
 Chinese TTF Fonts donated by Arphic company, with additional Hong Kong characters by Hong Kong font project and bitmap by F
@@ -110,13 +103,13 @@
 	for tmpfontdir in %{ttfontdir} %{miscfontdir}
 	do
 		touch $tmpfontdir 2> /dev/null && {
-			/usr/bin/ttmkfdir -d $tmpfontdir -o $tmpfontdir/fonts.scale
+			%{_bindir}/ttmkfdir -d $tmpfontdir -o $tmpfontdir/fonts.scale
 	    		mkfontdir $tmpfontdir
-			/usr/sbin/chkfontpath -q -a $tmpfontdir
+			%{_sbindir}/chkfontpath -q -a $tmpfontdir
 		}
 	done
 	#Update fontconfig cache
-	[  -x /usr/bin/fc-cache ] && /usr/bin/fc-cache 2> /dev/null
+	[  -x %{_bindir}/fc-cache ] && %{_bindir}/fc-cache 2> /dev/null
 
         # make symlinks for java referring to old path and fonts
         ln -sf ../../chinese/TrueType/uming.ttf %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf || :
@@ -128,11 +121,11 @@
 if [ "$1" = 0 ];
 then
     umask 133
-    /usr/sbin/chkfontpath -q -r %{ttfontdir}
-    /usr/sbin/chkfontpath -q -r %{miscfontdir}
+    %{_sbindir}/chkfontpath -q -r %{ttfontdir}
+    %{_sbindir}/chkfontpath -q -r %{miscfontdir}
 
     #Update fontconfig cache
-    [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache 2> /dev/null
+    [ -x %{_bindir}/fc-cache ] && %{_bindir}/fc-cache 2> /dev/null
 fi
 
 %files
@@ -142,12 +135,13 @@
 %dir %{ttfontdir}
 %dir %{miscfontdir}
 %dir %{cidmapdir}
-%{ttfontdir}
-%{miscfontdir}
 %dir %{_datadir}/fonts/zh_CN
 %dir %{_datadir}/fonts/zh_TW
 %dir %{_datadir}/fonts/zh_CN/TrueType
 %dir %{_datadir}/fonts/zh_TW/TrueType
+%{ttfontdir}/*.ttf
+%{miscfontdir}/*.gz
+%{miscfontdir}/fonts.alias
 %ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1
 %ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.cache-1
 %ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.dir
@@ -166,6 +160,11 @@
 
 
 %changelog
+* Thu Jul 26 2007 Caius Chance <cchance at redhat.com> - 3.03-5.fc7
+- Resolves: rhbz#249644 fc-cache is not always caching newly installed fonts 
+　　　　　　in fonts-chinese.
+- Refactorizes .spec file.
+
 * Thu Feb 01 2007 Caius Chance <cchance at redhat.com> - 3.03-4.fc7
 - Fixed bz#226716: LTC30501-Missing files in Traditional Chinese font support 
   package (el5->devel).