rpms/aplus-fsf/F-8 aplus-fsf.spec,1.17,1.18

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2649

Modified Files:
	aplus-fsf.spec 
Log Message:
Font packaging cleanup


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/F-8/aplus-fsf.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aplus-fsf.spec	7 Apr 2008 18:29:12 -0000	1.17
+++ aplus-fsf.spec	23 Apr 2008 16:40:32 -0000	1.18
@@ -1,4 +1,4 @@
-%define catalogue /etc/X11/fontpath.d/
+%define catalogue %{_sysconfdir}/X11/fontpath.d/
 %define name aplus-fsf
 %define ver 4.22
 %define rel 1
@@ -15,7 +15,7 @@
 
 Name: %name
 Version: 4.22.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -31,6 +31,7 @@
 
 BuildRequires: libtool
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-font-utils
 BuildRequires: automake autoconf
 
 Requires: xterm
@@ -52,9 +53,8 @@
 Summary: X11 Fonts for the Advanced APL Interpreter
 Group: User Interface/X
 Provides: fonts-apl
-Requires(post): %{_x11bindir}/mkfontdir
 Requires(post): fontconfig
-Requires(postun): %{_x11bindir}/mkfontdir, fontconfig
+Requires(postun): fontconfig
 %description -n fonts-x11-apl
 The A+ programming language development environment requires these 
 APL fonts to properly display A+ code in XTerm or XEmacs.
@@ -67,8 +67,8 @@
 Summary: TrueType fonts for the Advanced APL Interpreter
 Group: User Interface/X
 Provides: fonts-apl
-Requires(post): %{_x11bindir}/mkfontdir, ttmkfdir, fontconfig
-Requires(postun): %{_x11bindir}/mkfontdir, ttmkfdir, fontconfig
+Requires(post): fontconfig
+Requires(postun): fontconfig
 
 %description -n fonts-truetype-apl
 The A+ programming language development environment requires these 
@@ -148,40 +148,24 @@
 mv samples/Makefile samples/Makefile-%{_arch}
 %endif
 
-pushd $RPM_BUILD_ROOT/%{_x11fonts}/
-
-cp Kapl.alias fonts.alias
-
-rm -f {encodings,fonts}.dir
-touch {encodings,fonts}.dir
-chmod 0644 {encodings,fonts}.dir
-
-for fcver in $(seq 1 9); do
-  touch fonts.cache-$fcver
-  chmod 0644 fonts.cache-$fcver
-done
+install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/fonts/conf.d
+install -d $RPM_BUILD_ROOT/%{catalogue}
 
-popd
+# Installation X11-Fonts
 
-pushd $RPM_BUILD_ROOT/%{_ttffonts}/
+ln -sf %{_x11fonts} $RPM_BUILD_ROOT/%{catalogue}/apl-x11
 
-touch fonts.{alias,scale}
-chmod 0644 fonts.{alias,scale}
+mv $RPM_BUILD_ROOT/%{_x11fonts}/Kapl.alias \
+   $RPM_BUILD_ROOT/%{_x11fonts}/fonts.alias
+mkfontdir $RPM_BUILD_ROOT/%{_x11fonts}
+mkfontscale $RPM_BUILD_ROOT/%{_x11fonts}
 
-rm -f {encodings,fonts}.dir
-touch {encodings,fonts}.dir
-chmod 0644 {encodings,fonts}.dir
-
-for fcver in $(seq 1 9); do
-  touch fonts.cache-$fcver
-  chmod 0644 fonts.cache-$fcver
-done
+# Installation Truetyp-Fonts
 
-popd
+ln -sf %{_ttffonts} $RPM_BUILD_ROOT/%{catalogue}/apl-truetype
 
-mkdir -p $RPM_BUILD_ROOT%{catalogue}
-ln -sf %{_ttffonts} $RPM_BUILD_ROOT%{catalogue}/apl-truetype
-ln -sf %{_x11fonts} $RPM_BUILD_ROOT%{catalogue}/apl-x11
+mkfontdir $RPM_BUILD_ROOT/%{_ttffonts}
+mkfontscale $RPM_BUILD_ROOT/%{_ttffonts}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -189,14 +173,11 @@
 %post -n fonts-x11-apl
 
   FONTDIR=%{_x11fonts}
-  mkfontdir $FONTDIR
   fc-cache $FONTDIR
 
 %post -n fonts-truetype-apl
 
   FONTDIR=%{_ttffonts} 
-  ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
-  mkfontdir $FONTDIR
   fc-cache $FONTDIR
 
 %post -p /sbin/ldconfig
@@ -207,7 +188,6 @@
 
   FONTDIR=%{_x11fonts}
   if [ "$1" = "0" ]; then
-    mkfontdir $FONTDIR
     fc-cache $FONTDIR:unscaled
   fi
 
@@ -215,8 +195,6 @@
 
   FONTDIR=%{_ttffonts}
   if [ "$1" = "0" ]; then
-    ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
-    mkfontdir $FONTDIR
     fc-cache $FONTDIR
   fi
 
@@ -227,7 +205,7 @@
 %{_libdir}/a+
 %dir %{_x11appdef}
 %{_x11appdef}/XTerm-apl
-%{_fonts}/
+%dir %{_fonts}/apl
 %{_sysconfdir}/ld.so.conf.d/aplus-fsf-%{_arch}.conf
 %{_datadir}/aplus-fsf/
 
@@ -247,24 +225,28 @@
 
 %files -n fonts-x11-apl
 %defattr(-,root,root,-)
+%dir %{_x11fonts}
 %{_x11fonts}/K*
-%ghost %verify(not md5 size mtime) %{_x11fonts}/encodings.dir
-%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-*
+# %verify(not md5 size mtime) %{_x11fonts}/encodings.dir
+%verify(not md5 size mtime) %{_x11fonts}/fonts.scale
+%verify(not md5 size mtime) %{_x11fonts}/fonts.dir
+%verify(not md5 size mtime) %{_x11fonts}/fonts.alias
 %{catalogue}/apl-x11
 
 %files -n fonts-truetype-apl
 %defattr(-,root,root,-)
+%dir %{_ttffonts}
 %{_ttffonts}/K*
-%ghost %verify(not md5 size mtime) %{_ttffonts}/encodings.dir
-%ghost %verify(not md5 size mtime) %{_ttffonts}/fonts.dir
-%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-*
+# %verify(not md5 size mtime) %{_ttffonts}/encodings.dir
+%verify(not md5 size mtime) %{_ttffonts}/fonts.dir
+# %verify(not md5 size mtime) %{_ttffonts}/fonts.alias
+%verify(not md5 size mtime) %{_ttffonts}/fonts.scale
 %{catalogue}/apl-truetype
 
 %Changelog
+* Tue Apr 22 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.1-3
+- Font packaging cleanup (#443442, #443444)
+
 * Sun Apr  6 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.1-2
 - New upstream release (#435074)