OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   03-Aug-2007 13:21:06
  Branch: HEAD                             Handle: 2007080312210500

  Modified files:
    openpkg-src/fonts-free  fonts-free.spec fonts-free.txt

  Log:
    switch to the URW++ fonts from Ghostscript/GhostPCL

  Summary:
    Revision    Changes     Path
    1.2         +7  -10     openpkg-src/fonts-free/fonts-free.spec
    1.2         +3  -2      openpkg-src/fonts-free/fonts-free.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/fonts-free/fonts-free.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 fonts-free.spec
  --- openpkg-src/fonts-free/fonts-free.spec    31 Jul 2007 13:10:03 -0000      
1.1
  +++ openpkg-src/fonts-free/fonts-free.spec    3 Aug 2007 11:21:05 -0000       
1.2
  @@ -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 @@
   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 @@
   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 @@
       }
       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 @@
       %{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 @@
       #   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
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/fonts-free/fonts-free.txt
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 fonts-free.txt
  --- openpkg-src/fonts-free/fonts-free.txt     31 Jul 2007 13:10:03 -0000      
1.1
  +++ openpkg-src/fonts-free/fonts-free.txt     3 Aug 2007 11:21:05 -0000       
1.2
  @@ -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
   
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to