- 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)

Changed files:
    fonts-Type1-urw.spec -> 1.6

diff --git a/fonts-Type1-urw.spec b/fonts-Type1-urw.spec
index 731025a278dfec251b6e68032c2186bd45e75c5a..cb90a41d2aa369fc0bd7abecd812616a719e17f0 100644 (file)
--- a/fonts-Type1-urw.spec
+++ b/fonts-Type1-urw.spec
@@ -4,10 +4,11 @@ Summary(pl.UTF-8):    Wolnodostępne wersje 35 standardowych fontów postscriptowyc
 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
@@ -18,6 +19,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                t1fontsdir      %{_fontsdir}/Type1
 %define                t1afmdir        %{t1fontsdir}/afm
+%define                t1pfmdir        %{t1fontsdir}/pfm
 
 %description
 Free, good quality versions of the 35 standard PostScript(TM) fonts,
@@ -36,15 +38,21 @@ oryginalnych nazw Adobe (np. Times, Helvetica itd.).
 
 %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
@@ -58,6 +66,8 @@ fontpostinst Type1
 %files
 %defattr(644,root,root,755)
 %doc README* ChangeLog
+%{t1fontsdir}/Fontmap.urw
 %{t1fontsdir}/fonts.scale.urw
 %{t1fontsdir}/*.pfb
 %{t1afmdir}/*.afm
+%{t1pfmdir}/*.pfm