rpms/aplus-fsf/devel aplus-fsf.spec,1.12,1.13

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3860

Modified Files:
	aplus-fsf.spec 
Log Message:
Remove chkfontpath for F8


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- aplus-fsf.spec	5 Jun 2007 14:13:35 -0000	1.12
+++ aplus-fsf.spec	30 Jul 2007 19:32:11 -0000	1.13
@@ -1,4 +1,4 @@
-
+%define catalogue /etc/X11/fontpath.d/
 %define name aplus-fsf
 %define ver 4.20
 %define rel 2
@@ -15,7 +15,7 @@
 
 Name: %name
 Version: 4.20.2
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPL
 
 Summary: Advanced APL interpreter with s interface
@@ -54,7 +54,7 @@
 Group: User Interface/X
 Provides: fonts-apl
 Requires(post): %{_x11bindir}/mkfontdir
-Requires(post): fontconfig, chkfontpath
+Requires(post): fontconfig
 Requires(postun): %{_x11bindir}/mkfontdir, fontconfig
 %description -n fonts-x11-apl
 The A+ programming language development environment requires these 
@@ -68,7 +68,7 @@
 Summary: TrueType fonts for the Advanced APL Interpreter
 Group: User Interface/X
 Provides: fonts-apl
-Requires(post): %{_x11bindir}/mkfontdir, ttmkfdir, fontconfig, chkfontpath
+Requires(post): %{_x11bindir}/mkfontdir, ttmkfdir, fontconfig
 Requires(postun): %{_x11bindir}/mkfontdir, ttmkfdir, fontconfig
 
 %description -n fonts-truetype-apl
@@ -189,14 +189,14 @@
   FONTDIR=%{_x11fonts}
   mkfontdir $FONTDIR
   fc-cache $FONTDIR
-  chkfontpath -qa $FONTDIR
+  ln -sf $FONTDIR $RPM_BUILD_ROOT%{catalogue}/apl-x11
 
 %post -n fonts-truetype-apl
 
   FONTDIR=%{_ttffonts} 
   ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
   mkfontdir $FONTDIR
-  chkfontpath -qa $FONTDIR
+  ln -sf $FONTDIR $RPM_BUILD_ROOT%{catalogue}/apl-truetype
   fc-cache $FONTDIR
 
 %post -p /sbin/ldconfig
@@ -209,7 +209,6 @@
   if [ "$1" = "0" ]; then
     mkfontdir $FONTDIR
     fc-cache $FONTDIR:unscaled
-    chkfontpath -qr $FONTDIR
   fi
 
 %postun -n fonts-truetype-apl
@@ -219,7 +218,6 @@
     ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
-    chkfontpath -qr $FONTDIR
   fi
 
 %files
@@ -253,6 +251,7 @@
 %ghost %verify(not md5 size mtime) %{_x11fonts}/fonts.dir
 %ghost %verify(not md5 size mtime) %{_x11fonts}/fonts.alias
 %ghost %verify(not md5 size mtime) %{_x11fonts}/fonts.cache-*
+%{catalogue}/apl-x11
 
 %files -n fonts-truetype-apl
 %defattr(-,root,root,-)
@@ -262,8 +261,12 @@
 %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.alias
 %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.scale
 %ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.cache-*
+%{catalogue}/apl-truetype
 
 %Changelog
+* Mon Jul 30 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-20
+- Remove chkfontpath from package for F8
+
 * Tue Jun  5 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-19
 - Correctiog come typos (#242304)