rpms/fonts-chinese/devel fonts-chinese.spec,1.16,1.17

[fedora-cvs-commits at redhat.com]

Author: wtogami

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

Modified Files:
	fonts-chinese.spec 
Log Message:
use less fragile way to call mkfontdir
(and cleanup cleanup)



Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fonts-chinese.spec	15 Nov 2005 03:57:15 -0000	1.16
+++ fonts-chinese.spec	15 Nov 2005 21:30:50 -0000	1.17
@@ -2,8 +2,6 @@
 %define	ttfontdir	%{basefontdir}/TrueType
 %define	miscfontdir	%{basefontdir}/misc
 %define cidmapdir   %{_sysconfdir}/ghostscript
-%define ___mkfontdir	%(echo `which mkfontdir`)
-%define __mkfontdir	umask 133; %___mkfontdir
 
 %define beta 0.dot.3
 %define ver 0.1
@@ -12,7 +10,7 @@
 Summary:    Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
 Name:		fonts-chinese
 Version:    3.02
-Release:    1
+Release:    2
 License:	Arphic Public License (GPL-like)
 Group:		User Interface/X
 BuildArch:	noarch
@@ -55,7 +53,7 @@
 popd
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{ttfontdir}
 install -d $RPM_BUILD_ROOT%{miscfontdir}
@@ -88,20 +86,20 @@
 touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.scale
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post
 {
 	umask 133
 	touch %{ttfontdir} 2> /dev/null && {
 		/usr/bin/ttmkfdir -d %{ttfontdir} -o %{ttfontdir}/fonts.scale
-	    %__mkfontdir %{ttfontdir}
+	    "`which mkfontdir` %{ttfontdir}"
 		/usr/sbin/chkfontpath -q -a %{ttfontdir}
 	}
 
 	touch %{miscfontdir} 2> /dev/null && {
 		/usr/bin/ttmkfdir -d %{miscfontdir} -o %{miscfontdir}/fonts.scale
-	    %__mkfontdir %{miscfontdir}
+	    "`which mkfontdir` %{ttfontdir}"
 		/usr/sbin/chkfontpath -q -a %{miscfontdir}
 	}
 	#Update fontconfig cache
@@ -141,6 +139,9 @@
 %{cidmapdir}/cidfmap.zh_CN
 
 %changelog
+* Tue Nov 15 2005 Warren Togami <wtogami at redhat.com> - 3.02-2
+- use less fragile way to call mkfontdir
+
 * Tue Nov 15 2005 Leon Ho <llch at redhat.com> - 3.02-1
 - migrate taipeifonts to this package