rpms/terminus-font/F-9 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 terminus-font-console.README.fedora, 1.1, 1.2 terminus-font.spec, 1.6, 1.7

Sun Dec 7 12:54:38 UTC 2008

Author: ndim

Update of /cvs/pkgs/rpms/terminus-font/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29721

Modified Files:
	.cvsignore sources terminus-font-console.README.fedora 
	terminus-font.spec 
Log Message:
* Sun Sep 21 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.28-1
- Update to upstream's 4.28 release.
- Add -dv1, -ge1, -ij1 patches for more general appeal in cyrillic world.
- Add notes for framebuffer console to terminus-font-console.README.fedora.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-font/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- .cvsignore	1 May 2008 15:37:26 -0000	1.3
+++ .cvsignore	7 Dec 2008 12:54:07 -0000	1.4
@@ -1 +1,4 @@
-terminus-font-4.26.tar.gz
+terminus-font-4.28.tar.gz
+terminus-font-4.28-dv1.diff.gz
+terminus-font-4.28-ge1.diff.gz
+terminus-font-4.28-ij1.diff.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-font/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 May 2008 15:37:26 -0000	1.3
+++ sources	7 Dec 2008 12:54:07 -0000	1.4
@@ -1 +1,4 @@
-a0352316f3b983ddc670b25ab166094e  terminus-font-4.26.tar.gz
+15bf2f17b625312383fd9dae0925a17e  terminus-font-4.28.tar.gz
+74e2db5288065403a58c28672590c1cd  terminus-font-4.28-dv1.diff.gz
+7815830460294d79d8508199499e1408  terminus-font-4.28-ge1.diff.gz
+54ea26d7671d57d611ee4229f000fc10  terminus-font-4.28-ij1.diff.gz


Index: terminus-font-console.README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-font/F-9/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	7 Dec 2008 12:54:07 -0000	1.2
@@ -5,11 +5,23 @@
 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 or
+   framebuffer console by running something like
+
+      /bin/setfont /lib/kbd/consolefonts/ter-u16b.psf.gz
+
+   Note that using a font of a different font size will change the
+   $COLUMNS and $LINES of the terminal together with the changed
+   font size.
+
+ * 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/F-9/terminus-font.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- terminus-font.spec	1 May 2008 15:37:26 -0000	1.6
+++ terminus-font.spec	7 Dec 2008 12:54:07 -0000	1.7
@@ -1,16 +1,19 @@
 Name:           terminus-font
-Version:        4.26
+Version:        4.28
 Release:        1%{?dist}
 Summary:        Clean fixed width font
 BuildArch:      noarch
 
 Group:          User Interface/X
 License:        GPLv2+
-URL:            http://www.is-vn.bg/hamster/jimmy-en.html
+URL:            http://www.is-vn.bg/hamster/
 Source0:        http://www.is-vn.bg/hamster/%{name}-%{version}.tar.gz
 Source10:       terminus-font-console.README.fedora
 Source20:       terminus-font-x11.README.fedora
 Source21:       terminus-font-x11.Xresources.example
+Patch11:        http://www.is-vn.bg/hamster/%{name}-%{version}-dv1.diff.gz
+Patch12:        http://www.is-vn.bg/hamster/%{name}-%{version}-ge1.diff.gz
+Patch13:        http://www.is-vn.bg/hamster/%{name}-%{version}-ij1.diff.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  /usr/bin/bdftopcf
@@ -34,12 +37,10 @@
 The Terminus Font is designed for long (8 and more hours per day)
 work with computers.
 
-Version 4.26 contains 752 characters, covering code pages
-ISO8859-1/2/5/7/9/13/15/16, IBM-437/852/855/866, KOI8-R/U/E/F,
-Windows-1250/1251/1252/1253/1254/1257, Paratype-PT154/PT254,
-Bulgarian-MIK, Macintosh-Ukrainian, Esperanto and many others
-(a total of about 115 language sets). Also included are the
-IBM VGA, vt100 and xterm pseudographic characters.
+Version 4.28 contains 825 characters, covers about 120 language
+sets and supports ISO8859-1/2/5/7/9/13/15/16, Paratype-PT154/PT254,
+KOI8-R/U/E/F, Esperanto, many IBM, Windows and Macintosh code pages,
+as well as the IBM VGA, vt100 and xterm pseudographic characters.
 
 The sizes present are 6x12, 8x14, 8x16, 10x20, 12x24, 14x28
 and 16x32. The styles are normal and bold (except for 6x12),
@@ -55,19 +56,16 @@
 
 
 %package x11
-Group:            User Interface/X
-Summary:          Clean fixed width font (X11 version)
-Requires:         fontconfig
+Group:             User Interface/X
+Summary:           Clean fixed width font (X11 version)
 # First filesystem package to contain %{catalogue}/ dir.
-# However, filesystem >= 2.4.11-1 is not available on F-7 (yet?), while
-# the libXfont requirements are satisfied there. So we allow F-7 by ignoring
-# the filesystem package for now.
-# Requires:         filesystem >= 2.4.11-1
+Requires:          filesystem >= 2.4.11-1
 # First libXfont to support the %{catalogue} mechanism.
-Requires:         libXfont >= 1.2.9-1
-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
@@ -108,6 +106,9 @@
 
 %prep
 %setup -q
+%patch11 -p0 -b .dv1
+%patch12 -p0 -b .ge1
+%patch13 -p0 -b .ij1
 
 
 %build
@@ -335,13 +336,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
 
 
@@ -548,6 +555,17 @@
 
 
 %changelog
+* Sun Sep 21 2008 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.28-1
+- Update to upstream's 4.28 release.
+- Add -dv1, -ge1, -ij1 patches for more general appeal in cyrillic world.
+- Add notes for framebuffer console to terminus-font-console.README.fedora.
+
+* 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


