rpms/aplus-fsf/F-7 aplus-fsf.spec,1.13,1.14

Jochen Schmitt (s4504kr) fedora-extras-commits at redhat.com
Wed Apr 23 16:45:10 UTC 2008 

Author: s4504kr

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

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


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/F-7/aplus-fsf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- aplus-fsf.spec	8 Apr 2008 15:49:25 -0000	1.13
+++ aplus-fsf.spec	23 Apr 2008 16:44:33 -0000	1.14
@@ -1,3 +1,4 @@
+%define catalogue %{_sysconfdir}/X11/fontpath.d/
 %define name aplus-fsf
 %define ver 4.22
 %define rel 1
@@ -14,7 +15,7 @@
 
 Name: %name
 Version: 4.22.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -30,6 +31,7 @@
 
 BuildRequires: libtool
 BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-font-utils
 BuildRequires: automake autoconf
 
 Requires: xterm
@@ -51,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, chkfontpath
-Requires(postun): %{_x11bindir}/mkfontdir, fontconfig
+Requires(post): 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.
@@ -66,8 +67,8 @@
 Summary: TrueType fonts for the Advanced APL Interpreter
 Group: User Interface/X
 Provides: fonts-apl
-Requires(post): %{_x11bindir}/mkfontdir, ttmkfdir, fontconfig, chkfontpath
-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 
@@ -107,7 +108,7 @@
 aclocal
 automake
 autoconf
-%configure --prefix=/usr --docdir=%{_docdir}/%{name}-%{version}
+%configure --prefix=/usr --docdir=%{_datadir}/doc/%{name}-%{version}
 make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool"
 
 %install
@@ -147,36 +148,24 @@
 mv samples/Makefile samples/Makefile-%{_arch}
 %endif
 
-pushd $RPM_BUILD_ROOT/%{_x11fonts}/
+install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/fonts/conf.d
+install -d $RPM_BUILD_ROOT/%{catalogue}
 
-cp Kapl.alias fonts.alias
+# Installation X11-Fonts
 
-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
+ln -sf %{_x11fonts} $RPM_BUILD_ROOT/%{catalogue}/apl-x11
 
-popd
-
-pushd $RPM_BUILD_ROOT/%{_ttffonts}/
+mv $RPM_BUILD_ROOT/%{_x11fonts}/Kapl.alias \
+   $RPM_BUILD_ROOT/%{_x11fonts}/fonts.alias
+mkfontdir $RPM_BUILD_ROOT/%{_x11fonts}
+mkfontscale $RPM_BUILD_ROOT/%{_x11fonts}
 
-touch fonts.{alias,scale}
-chmod 0644 fonts.{alias,scale}
+# Installation Truetyp-Fonts
 
-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
+ln -sf %{_ttffonts} $RPM_BUILD_ROOT/%{catalogue}/apl-truetype
 
-popd
+mkfontdir $RPM_BUILD_ROOT/%{_ttffonts}
+mkfontscale $RPM_BUILD_ROOT/%{_ttffonts}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -184,16 +173,11 @@
 %post -n fonts-x11-apl
 
   FONTDIR=%{_x11fonts}
-  mkfontdir $FONTDIR
   fc-cache $FONTDIR
-  chkfontpath -qa $FONTDIR
 
 %post -n fonts-truetype-apl
 
   FONTDIR=%{_ttffonts} 
-  ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
-  mkfontdir $FONTDIR
-  chkfontpath -qa $FONTDIR
   fc-cache $FONTDIR
 
 %post -p /sbin/ldconfig
@@ -204,19 +188,14 @@
 
   FONTDIR=%{_x11fonts}
   if [ "$1" = "0" ]; then
-    mkfontdir $FONTDIR
     fc-cache $FONTDIR:unscaled
-    chkfontpath -qr $FONTDIR
   fi
 
 %postun -n fonts-truetype-apl
 
   FONTDIR=%{_ttffonts}
   if [ "$1" = "0" ]; then
-    ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
-    mkfontdir $FONTDIR
     fc-cache $FONTDIR
-    chkfontpath -qr $FONTDIR
   fi
 
 %files
@@ -226,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/
 
@@ -246,27 +225,40 @@
 
 %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  8 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.22.1-1
+* 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)
 
-* Sun Aug 12 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-20
+* Mon Mar 31 2008 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-24
+- Disable x86_64 architecture (#435074)
+
+* 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
 
 * Tue Jun  5 2007 Jochen Schmitt <Jochen herr-schmitt de> 4.20.2-19
 - Correctiog come typos (#242304)

More information about the fedora-extras-commits mailing list