SPECS: fonts-Type1-urw.spec - better fonts.scale: get original fon...

[qboosh]

Author: qboosh                       Date: Wed Dec 26 01:03:07 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- better fonts.scale: get original font names from supplied fonts.dir, but add
  remaining encodings from autogenerated fonts.scale
- merged .Fontmap from ghostscript-fonts-std
- install pfm metrics
- GPL v2 (as specified in included COPYING file)

---- Files affected:
SPECS:
   fonts-Type1-urw.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/fonts-Type1-urw.spec
diff -u SPECS/fonts-Type1-urw.spec:1.5 SPECS/fonts-Type1-urw.spec:1.6
--- SPECS/fonts-Type1-urw.spec:1.5	Wed Dec 26 00:06:10 2007
+++ SPECS/fonts-Type1-urw.spec	Wed Dec 26 02:03:02 2007
@@ -5,10 +5,11 @@
 Name:		fonts-Type1-urw
 Version:	1.0.7
 Release:	0.%{pre}.2
-License:	GPL
+License:	GPL v2
 Group:		Fonts
 Source0:	ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-%{version}%{pre}.tar.bz2
 # Source0-md5:	97ff7f315bcf36558d7f326878551ac3
+Source1:	%{name}.Fontmap
 BuildRequires:	xorg-app-mkfontscale
 Requires(post,postun):	fontpostinst >= 0.1-6
 Requires:	%{_fontsdir}/Type1
@@ -19,6 +20,7 @@
 
 %define		t1fontsdir	%{_fontsdir}/Type1
 %define		t1afmdir	%{t1fontsdir}/afm
+%define		t1pfmdir	%{t1fontsdir}/pfm
 
 %description
 Free, good quality versions of the 35 standard PostScript(TM) fonts,
@@ -37,15 +39,21 @@
 
 %build
 %{_bindir}/mkfontscale .
+tail -n +2 fonts.dir > fonts.dir.raw
+LC_ALL=C sort -t- -k1,13 -u fonts.dir.raw > fonts.dir.sorted
+join -j1 -t- -o1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,1.10,1.11,1.12,1.13,2.14,2.15 fonts.dir.sorted fonts.scale > fonts.scale.add
+LC_ALL=C sort -u fonts.dir.raw fonts.scale.add > fonts.scale.urw
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{t1fontsdir},%{t1afmdir}}
+install -d $RPM_BUILD_ROOT{%{t1fontsdir},%{t1afmdir},%{t1pfmdir}}
 
 install *.pfb $RPM_BUILD_ROOT%{t1fontsdir}
 install *.afm $RPM_BUILD_ROOT%{t1afmdir}
+install *.pfm $RPM_BUILD_ROOT%{t1pfmdir}
 
-grep ".pfb" fonts.scale > $RPM_BUILD_ROOT%{t1fontsdir}/fonts.scale.urw
+install fonts.scale.urw $RPM_BUILD_ROOT%{t1fontsdir}/fonts.scale.urw
+install %{SOURCE1} $RPM_BUILD_ROOT%{t1fontsdir}/Fontmap.urw
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,9 +67,11 @@
 %files
 %defattr(644,root,root,755)
 %doc README* ChangeLog
+%{t1fontsdir}/Fontmap.urw
 %{t1fontsdir}/fonts.scale.urw
 %{t1fontsdir}/*.pfb
 %{t1afmdir}/*.afm
+%{t1pfmdir}/*.pfm
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -69,6 +79,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007-12-26 01:03:02  qboosh
+- better fonts.scale: get original font names from supplied fonts.dir, but add
+  remaining encodings from autogenerated fonts.scale
+- merged .Fontmap from ghostscript-fonts-std
+- install pfm metrics
+- GPL v2 (as specified in included COPYING file)
+
 Revision 1.5  2007-12-25 23:06:10  qboosh
 - pl
 - different versioning scheme, no sense in g-f-s P: versioned with VR
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fonts-Type1-urw.spec?r1=1.5&r2=1.6&f=u