rpms/terminus-font/F-10 terminus-font.spec,1.8,1.9

[Hans Ulrich Niedermann]

Author: ndim

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

Modified Files:
	terminus-font.spec 
Log Message:
* Thu Feb 19 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.28-1.fc10.1
- generate fonts.dir at build time (bug 483589)



Index: terminus-font.spec
===================================================================
RCS file: /cvs/pkgs/rpms/terminus-font/F-10/terminus-font.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- terminus-font.spec	7 Dec 2008 12:54:05 -0000	1.8
+++ terminus-font.spec	19 Feb 2009 00:55:44 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           terminus-font
 Version:        4.28
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Clean fixed width font
 BuildArch:      noarch
 
@@ -17,6 +17,7 @@
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  /usr/bin/bdftopcf
+BuildRequires:  /usr/bin/mkfontdir
 
 
 # This directory is owned by the fontconfig package.
@@ -120,20 +121,18 @@
 
 # Fedora specific docs and examples
 mkdir -p docs/console docs/x11
-%{__cp} -p "%{SOURCE10}" docs/console/README.fedora
-%{__cp} -p "%{SOURCE20}" docs/x11/README.fedora
-%{__cp} -p "%{SOURCE21}" docs/x11/Xresources.example
+cp -p "%{SOURCE10}" docs/console/README.fedora
+cp -p "%{SOURCE20}" docs/x11/README.fedora
+cp -p "%{SOURCE21}" docs/x11/Xresources.example
 
 
 %install
 %{__rm} -rf "%{buildroot}"
 %{__make} DESTDIR="%{buildroot}" TESTDIR= install install-ref
-# Create %%ghost files (to simulate files created by mkfontdir)
-(cd "%{buildroot}%{local_x11_font_dir}" && \
-    touch fonts.dir fonts.scale fonts.alias encodings.dir)
 # Install catalogue symlink
 %{__mkdir_p} "%{buildroot}%{catalogue}"
 %{__ln_s} -f "%{local_x11_font_dir}" "%{buildroot}%{catalogue}/%{name}:unscaled"
+/usr/bin/mkfontdir "%{buildroot}%{local_x11_font_dir}"
 
 
 %clean
@@ -145,11 +144,8 @@
 %doc README README-BG
 %doc docs/x11/README.fedora docs/x11/Xresources.example
 %dir %{local_x11_font_dir}
-%ghost %verify(not md5 size mtime) %{local_x11_font_dir}/fonts.dir
-%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}/fonts.dir
 %{local_x11_font_dir}/ter-520n.pcf.gz
 %{local_x11_font_dir}/ter-g14b.pcf.gz
 %{local_x11_font_dir}/ter-x32n.pcf.gz
@@ -339,9 +335,6 @@
 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
@@ -555,6 +548,9 @@
 
 
 %changelog
+* Thu Feb 19 2009 Hans Ulrich Niedermann <hun at n-dimensional.de> - 4.28-1.fc10.1
+- generate fonts.dir at build time (bug 483589)
+
 * 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.