rpms/aplus-fsf/devel aplus-fsf.spec,1.14,1.15

[Jochen Schmitt (s4504kr)]

Author: s4504kr

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

Modified Files:
	aplus-fsf.spec 
Log Message:
Fix issue with new font procedure


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- aplus-fsf.spec	8 Aug 2007 17:41:14 -0000	1.14
+++ aplus-fsf.spec	8 Aug 2007 19:19:16 -0000	1.15
@@ -15,7 +15,7 @@
 
 Name: %name
 Version: 4.20.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -181,6 +181,10 @@
 
 popd
 
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{_ttffonts} $RPM_BUILD_ROOT%{catalogue}/apl-truetype
+ln -sf %{_x11fonts} $RPM_BUILD_ROOT%{catalogue}/apl-x11
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -189,14 +193,12 @@
   FONTDIR=%{_x11fonts}
   mkfontdir $FONTDIR
   fc-cache $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
-  ln -sf $FONTDIR $RPM_BUILD_ROOT%{catalogue}/apl-truetype
   fc-cache $FONTDIR
 
 %post -p /sbin/ldconfig
@@ -264,8 +266,9 @@
 %{catalogue}/apl-truetype
 
 %Changelog
-* Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-21
+* Wed Aug  8 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-22
 - Changing license tag
+- Fix issue with new font catalogue
 
 * Mon Jul 30 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-20
 - Remove chkfontpath from package for F8