rpms/fonts-japanese/devel fonts-japanese.spec,1.9,1.10

[fedora-cvs-commits at redhat.com]

Author: tagoh

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

Modified Files:
	fonts-japanese.spec 
Log Message:
* Mon Nov  7 2005 Akira TAGOH <tagoh at redhat.com> - 0.20050222-8
- rely on PATH to find mkfontdir instead of /usr/X11R6/bin hardcoded.
- replace Requires: mkfontdir instead of /usr/X11R6/bin/mkfontdir.


Index: fonts-japanese.spec
===================================================================
RCS file: /cvs/dist/rpms/fonts-japanese/devel/fonts-japanese.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fonts-japanese.spec	16 Aug 2005 12:05:50 -0000	1.9
+++ fonts-japanese.spec	7 Nov 2005 09:51:29 -0000	1.10
@@ -3,7 +3,8 @@
 %define ttfontdir	%{basefontdir}/TrueType
 %define bmpfontdir	%{basefontdir}/misc
 %define cidmapdir	%{_sysconfdir}/ghostscript
-%define __mkfontdir	umask 133;/usr/X11R6/bin/mkfontdir
+%define ___mkfontdir	%(echo `which mkfontdir`)
+%define __mkfontdir	umask 133; %___mkfontdir
 %define chxlfd		/usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/chbdfxlfd.pl
 %define mkalias		/usr/bin/perl $RPM_BUILD_DIR/%{name}-%{version}/%{vft}/mkalias.pl
 %define mkbold		$RPM_BUILD_DIR/%{name}-%{version}/%{shinonome}-src/tools/mkbold
@@ -24,7 +25,7 @@
 
 Name:		fonts-japanese
 Version:	0.20050222
-Release:	7
+Release:	8
 License:	Distributable
 Group:		User Interface/X
 BuildArch:	noarch
@@ -89,10 +90,10 @@
 
 
 Summary:	Free Japanese Bitmap/TrueType fonts
-Requires(post,postun): /usr/sbin/chkfontpath /usr/X11R6/bin/mkfontdir
+Requires(post,postun): /usr/sbin/chkfontpath mkfontdir
 Requires(post,postun): ttmkfdir >= 3.0.6
 Requires(post,postun): fontconfig
-Requires(post,postun): /usr/X11R6/bin/mkfontdir
+Requires(post,postun): mkfontdir
 Obsoletes: ttfonts-ja jisksp14 jisksp16-1990 kappa20 knm_new fonts-ja
 %description
 This package provides the free Japanese Bitmap/TrueType fonts.
@@ -348,7 +349,7 @@
 {
     touch %{ttfontdir} 2> /dev/null && {
 	/usr/bin/ttmkfdir -d %{ttfontdir} -o %{ttfontdir}/fonts.scale
-	/usr/X11R6/bin/mkfontdir %{ttfontdir}
+	%__mkfontdir %{ttfontdir}
 	/usr/sbin/chkfontpath -q -a %{ttfontdir}
     }
     %__mkfontdir %{bmpfontdir} && /usr/sbin/chkfontpath -q -a %{bmpfontdir}
@@ -389,6 +390,10 @@
 %{cidmapdir}/cidfmap.ja
 
 %changelog
+* Mon Nov  7 2005 Akira TAGOH <tagoh at redhat.com> - 0.20050222-8
+- rely on PATH to find mkfontdir instead of /usr/X11R6/bin hardcoded.
+- replace Requires: mkfontdir instead of /usr/X11R6/bin/mkfontdir.
+
 * Tue Aug 16 2005 Akira TAGOH <tagoh at redhat.com> - 0.20050222-7
 - Added cidfmap.ja for the latest ghostscript.
 - Removed Kochi fonts.