switch to the URW++ fonts from Ghostscript/GhostPCL

fonts-free/fonts-free.spec

@@ -33,7 +33,7 @@
 %define       V_delicious  20061021
 %define       V_fontin     2
 %define       V_fontinsans 45
-%define       V_urw        1.0.7pre18
+%define       V_urw        1.41
 %define       V_freefont   20060126
 %define       V_arkpandora 2.04
 
@@ -48,7 +48,7 @@ Class:        EVAL
 Group:        Graphics
 License:      Open Source
 Version:      0
-Release:      20070731
+Release:      20070803
 
 #   list of sources
 Source0:      http://www.redhat.com/f/fonts/liberation-fonts-ttf-%{V_liberation}.tar.gz
@@ -61,7 +61,7 @@ Source6:      ftp://ftp.openpkg.org/sources/CPY/fonts-free/Union-%{V_union}.tar.
 Source7:      ftp://ftp.openpkg.org/sources/CPY/fonts-free/delicious-%{V_delicious}.zip
 Source8:      http://www.exljbris.nl/pc/fontin%{V_fontin}.zip
 Source9:      http://www.josbuivenga.demon.nl/FontinSans_%{V_fontinsans}.zip
-Source10:     ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-%{V_urw}-otf.tar.bz2
+Source10:     ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/GhostPCL/urwfonts-%{V_urw}.tar.bz2
 Source11:     http://download.savannah.gnu.org/releases/freefont/freefont-ttf-%{V_freefont}.tar.gz
 Source12:     http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-%{V_arkpandora}.tgz
 Source13:     fonts-free.txt
@@ -135,8 +135,8 @@ AutoReqProv:  no
     }
     prog fonts-free:urw = {
         version   = %{V_urw}
-        url       = ftp://ftp.gnome.ru/fonts/urw/release/
-        regex     = urw-fonts-(__VER__)-otf\.tar\.bz2
+        url       = http://www.ghostscript.com/awki/GhostPCL
+        regex     = urwfonts-(__VER__)\.tar\.bz2
     }
     prog fonts-free:freefont = {
         version   = %{V_freefont}
@@ -160,10 +160,7 @@ AutoReqProv:  no
     %{l_prefix}/bin/unzip -q -x %{SOURCE7}
     %{l_prefix}/bin/unzip -q -x %{SOURCE8}
     %{l_prefix}/bin/unzip -q -x %{SOURCE9}
-    ( mkdir urw
-      cd urw
-      %{l_bzip2} -dc %{SOURCE10} | %{l_tar} xf -
-    ) || exit $?
+    %setup -q -T -D -a 10
     %setup -q -T -D -a 11
     %setup -q -T -D -a 12
 
@@ -237,7 +234,7 @@ AutoReqProv:  no
     #   install font: URW++
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/URW
-    cp  urw/*.otf \
+    cp  urwfonts-*/*.ttf \
         $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/URW/
 
     #   install font: FreeFont

fonts-free/fonts-free.txt

@@ -47,8 +47,9 @@
     Publisher: Jos Buivenga
     Author:    Jos Buivenga
 
-  o Font:      URW++ Postscript Fonts
-    Homepage:  ftp://ftp.gnome.ru/fonts/urw/release/
+  o Font:      URW++ Fonts
+    Homepage:  ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/GhostPCL/
+               ftp://ftp.gnome.ru/fonts/urw/release/
     Publisher: URW++ Design and Development GmbH
     Author:    URW++ Design and Development GmbH