rpms/fonts-chinese/devel fonts-chinese.spec,1.8,1.9

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/fonts-chinese/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19680

Modified Files:
	fonts-chinese.spec 
Log Message:
modular X


Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fonts-chinese.spec	7 Nov 2005 09:13:24 -0000	1.8
+++ fonts-chinese.spec	7 Nov 2005 09:47:01 -0000	1.9
@@ -8,7 +8,7 @@
 Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:		fonts-chinese
 Version:    3.00.%{ver}
-Release:    1
+Release:    2
 License:	Arphic Public License (GPL-like)
 Group:		User Interface/X
 BuildArch:	noarch
@@ -26,7 +26,7 @@
 Source23:	cidfmap.zh_CN
 
 Requires(post,postun): ttmkfdir >= 3.0.6
-Requires(post,postun): /usr/X11R6/bin/mkfontdir /usr/sbin/chkfontpath
+Requires(post,postun): mkfontdir, /usr/sbin/chkfontpath
 Requires(post,postun): fontconfig
 Obsoletes:	ttfonts-zh_CN ttfonts-zh_TW ttf-moe_sung ttf-moe_kai ttf-arphic_bming ttf-arphic_bkai
 
@@ -74,7 +74,7 @@
 	umask 133
 	touch %{ttfontdir} 2> /dev/null && {
 		/usr/bin/ttmkfdir -d %{ttfontdir} -o %{ttfontdir}/fonts.scale
-		/usr/X11R6/bin/mkfontdir %{ttfontdir}
+		`which mkfontdir` %{ttfontdir}
 		/usr/sbin/chkfontpath -q -a %{ttfontdir}
 	}
 
@@ -109,6 +109,9 @@
 %{cidmapdir}/cidfmap.zh_CN
 
 %changelog
+* Mon Nov 07 2005 Caolan McNamara <caolanm at redhat.com> - 3.00.0.1-2
+- modular X requires
+
 * Mon Nov 07 2005 Leon Ho <llch at redhat.com> - 3.00.0.1-1
 - update uming and ukai to 0.1-0.dot.3