rpms/terminus-font/devel terminus-font-x11.README.fedora, 1.1, 1.2 terminus-font.spec, 1.2, 1.3

[Hans Ulrich Niedermann (ndim)]

Author: ndim

Update of /cvs/pkgs/rpms/terminus-font/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1761

Modified Files:
	terminus-font-x11.README.fedora terminus-font.spec 
Log Message:
Drop the chkfontpath dependency (bug #252276, untested).



Index: terminus-font-x11.README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-font/devel/terminus-font-x11.README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- terminus-font-x11.README.fedora	5 Sep 2006 08:56:26 -0000	1.1
+++ terminus-font-x11.README.fedora	15 Aug 2007 11:34:16 -0000	1.2
@@ -3,6 +3,9 @@
 ========================================================================
 
 The terminus-font-x11 package registers the Terminus font with both
-xfs(1) and fonts-conf(5) and thus makes the font available for both
-traditional programs using xfs (like xterm, xfontsel, emacs) and for
-modern programs using fontconfig (like Gnome and KDE programs).
+fonts-conf(5) and the newer /etc/X11/fontpath.d mechanism used by newer
+libXfont and xfs(1) versions.
+
+This makes the font available for both traditional programs using
+libXfont or xfs (like xterm, xfontsel, emacs) and for modern programs
+using fontconfig (like Gnome and KDE programs).


Index: terminus-font.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-font/devel/terminus-font.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- terminus-font.spec	15 Aug 2007 10:23:43 -0000	1.2
+++ terminus-font.spec	15 Aug 2007 11:34:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           terminus-font
 Version:        4.20
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Clean fixed width font
 BuildArch:      noarch
 
@@ -26,6 +26,9 @@
 # It is owned by the kbd package.
 %define consolefonts_dir /%{_lib}/kbd/consolefonts
 
+# Font catalogue
+%define catalogue /etc/X11/fontpath.d
+
 
 %description
 The Terminus Font is designed for long (8 and more hours per day) work
@@ -55,11 +58,11 @@
 Group:            User Interface/X
 Summary:          Clean fixed width font (X11 version)
 Requires:         fontconfig
+# First filesystem package to contain %{catalogue}/ dir.
+Requires:         filesystem >= 2.4.11-1
 Requires(post):   /usr/bin/mkfontdir
-Requires(post):   /usr/sbin/chkfontpath
 Requires(post):   /usr/bin/fc-cache
 Requires(postun): /usr/bin/fc-cache
-Requires(postun): /usr/sbin/chkfontpath
 
 
 %description console
@@ -122,6 +125,9 @@
 # Create %%ghost files (to simulate files created by mkfontdir)
 (cd "$RPM_BUILD_ROOT%{local_x11_font_dir}" && \
     touch fonts.dir fonts.scale fonts.alias encodings.dir)
+# Install catalogue symlink                             
+mkdir -p "$RPM_BUILD_ROOT%{catalogue}"
+ln -sf "%{local_x11_font_dir}" "$RPM_BUILD_ROOT%{catalogue}/%{name}:unscaled"
 
 
 %clean
@@ -137,6 +143,7 @@
 %ghost %verify(not md5 size mtime) %{local_x11_font_dir}/fonts.scale
 %ghost %verify(not md5 size mtime) %{local_x11_font_dir}/fonts.alias
 %ghost %verify(not md5 size mtime) %{local_x11_font_dir}/encodings.dir
+%{catalogue}/%{name}:unscaled
 %{local_x11_font_dir}/ter-520n.pcf.gz
 %{local_x11_font_dir}/ter-g14b.pcf.gz
 %{local_x11_font_dir}/ter-x32n.pcf.gz
@@ -299,13 +306,11 @@
 # Run this both after initial installation and package update.
 /usr/bin/fc-cache %{global_font_dir}
 /usr/bin/mkfontdir %{local_x11_font_dir}
-/usr/sbin/chkfontpath -q -a %{local_x11_font_dir}:unscaled
 
 
 %postun x11
 if [ "$1" = "0" ]; then # Uninstall
   /usr/bin/fc-cache %{global_font_dir}
-  /usr/sbin/chkfontpath -q -r %{local_x11_font_dir}:unscaled
 fi
 
 
@@ -496,6 +501,12 @@
 
 
 %changelog
+* Wed Aug 15 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.20-8
+- Drop the chkfontpath dependency (bug #252276).
+
+* Wed Aug 15 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.20-7
+- Forcing rebuild.
+
 * Fri Aug  3 2007 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.20-6
 - Use proper license tag "GPLv2+".