rpms/terminus-font/devel terminus-font-console.README.fedora, 1.1, 1.2 terminus-font.spec, 1.6, 1.7

[Hans Ulrich Niedermann (ndim)]

Author: ndim

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

Modified Files:
	terminus-font-console.README.fedora terminus-font.spec 
Log Message:
* Sun May 18 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.26-2
- Update README.fedora for console fonts with answers.
- Make sure scriptlets never fail.
- Use -f option with fc-cache.
- Remove dependency on fontconfig.



Index: terminus-font-console.README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-font/devel/terminus-font-console.README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- terminus-font-console.README.fedora	5 Sep 2006 08:56:26 -0000	1.1
+++ terminus-font-console.README.fedora	17 May 2008 23:01:20 -0000	1.2
@@ -5,11 +5,21 @@
 The console package just dumps the font files in the directory where
 the other console fonts are and does not do any setting up (for now).
 
-You can manually change the font for the Linux VGA textmode console
-by running something like
+ * The difference between all those ter-????.psf.gz files is
+   explained in the file
 
-   /bin/setfont /lib/kbd/consolefonts/ter-u16b.psf.gz
+      /lib/kbd/consolefonts/README.terminus
+
+ * You can manually change the font for the Linux VGA textmode console
+   by running something like
+
+      /bin/setfont /lib/kbd/consolefonts/ter-u16b.psf.gz
+
+   TBD: How to do that on a Linux framebuffer console?
+
+ * To make the above setting permanent, adapt the file
+
+      /etc/sysconfig/i18n
+
+   to set SYSFONT="ter-u16b".
 
-TBD: How to do that on a Linux framebuffer console?
-TBD: How to make those settings permanent?
-TBD: What is the difference between all those ter-????.psf.gz files?


Index: terminus-font.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-font/devel/terminus-font.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- terminus-font.spec	17 May 2008 22:27:17 -0000	1.6
+++ terminus-font.spec	17 May 2008 23:01:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           terminus-font
 Version:        4.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Clean fixed width font
 BuildArch:      noarch
 
@@ -55,16 +55,16 @@
 
 
 %package x11
-Group:            User Interface/X
-Summary:          Clean fixed width font (X11 version)
+Group:             User Interface/X
+Summary:           Clean fixed width font (X11 version)
 # First filesystem package to contain %{catalogue}/ dir.
-Requires:         filesystem >= 2.4.11-1
+Requires:          filesystem >= 2.4.11-1
 # First libXfont to support the %{catalogue} mechanism.
-Conflicts:        libXfont < 1.2.9-1
-Requires:         fontconfig
-Requires(post):   /usr/bin/mkfontdir
-Requires(post):   /usr/bin/fc-cache
-Requires(postun): /usr/bin/fc-cache
+Conflicts:         libXfont < 1.2.9-1
+# We might use special fontconfig features some time.
+# Conflicts:         fontconfig < 0.0.0
+# We might not work with older mkfontdir
+# Conflicts:         xorg-x11-font-utils < 7.2-1
 
 
 %description console
@@ -332,13 +332,19 @@
 
 %post x11
 # Run this both after initial installation and package update.
-/usr/bin/fc-cache %{global_font_dir}
-/usr/bin/mkfontdir %{local_x11_font_dir}
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f %{global_font_dir} ||:
+fi
+if [ -x /usr/bin/mkfontdir ]; then
+  /usr/bin/mkfontdir %{local_x11_font_dir} ||:
+fi
 
 
 %postun x11
 if [ "$1" = "0" ]; then # Uninstall
-  /usr/bin/fc-cache %{global_font_dir}
+  if [ -x /usr/bin/fc-cache ]; then
+    /usr/bin/fc-cache -f %{global_font_dir} ||:
+  fi
 fi
 
 
@@ -545,6 +551,12 @@
 
 
 %changelog
+* Sun May 18 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.26-2
+- Update README.fedora for console fonts with answers.
+- Make sure scriptlets never fail.
+- Use -f option with fc-cache.
+- Remove dependency on fontconfig.
+
 * Thu May 01 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.26-1
 - Upstream release 4.26:
   - full set of greek characters