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:   21-Aug-2008 11:03:29
  Branch: HEAD                             Handle: 2008082110032501

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

  Log:
    add LinLibertine font and add missing MS CoreFonts in fontconfig
    config file

  Summary:
    Revision    Changes     Path
    1.3         +2  -0      openpkg-src/fonts-free/fonts-free.conf
    1.14        +21 -3      openpkg-src/fonts-free/fonts-free.spec
    1.4         +5  -0      openpkg-src/fonts-free/fonts-free.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/fonts-free/fonts-free.conf
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 fonts-free.conf
  --- openpkg-src/fonts-free/fonts-free.conf    3 Aug 2007 11:31:04 -0000       
1.2
  +++ openpkg-src/fonts-free/fonts-free.conf    21 Aug 2008 09:03:25 -0000      
1.3
  @@ -3,6 +3,7 @@
   <fontconfig>
       <dir>@l_prefix@/share/fonts-free/ArkPandora</dir>
       <dir>@l_prefix@/share/fonts-free/Cardo</dir>
  +    <dir>@l_prefix@/share/fonts-free/CoreFonts</dir>
       <dir>@l_prefix@/share/fonts-free/DejaVu</dir>
       <dir>@l_prefix@/share/fonts-free/Delicious</dir>
       <dir>@l_prefix@/share/fonts-free/Fontin</dir>
  @@ -10,6 +11,7 @@
       <dir>@l_prefix@/share/fonts-free/Gentium</dir>
       <dir>@l_prefix@/share/fonts-free/Liberation</dir>
       <dir>@l_prefix@/share/fonts-free/Lido</dir>
  +    <dir>@l_prefix@/share/fonts-free/LinLibertine</dir>
       <dir>@l_prefix@/share/fonts-free/URW</dir>
       <dir>@l_prefix@/share/fonts-free/Union</dir>
       <dir>@l_prefix@/share/fonts-free/Vera</dir>
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/fonts-free/fonts-free.spec
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 fonts-free.spec
  --- openpkg-src/fonts-free/fonts-free.spec    27 Jul 2008 18:11:06 -0000      
1.13
  +++ openpkg-src/fonts-free/fonts-free.spec    21 Aug 2008 09:03:26 -0000      
1.14
  @@ -36,6 +36,7 @@
   %define       V_freefont   20060126
   %define       V_arkpandora 2.04
   %define       V_corefonts  20020815
  +%define       V_libertine  2.8.14
   
   #   package information
   Name:         fonts-free
  @@ -48,7 +49,7 @@
   Group:        Graphics
   License:      Open Source
   Version:      0
  -Release:      20080727
  +Release:      20080821
   
   #   list of sources
   Source0:      
ftp://ftp.openpkg.org/sources/CPY/fonts-free/liberation-fonts-%{V_liberation}.zip
  @@ -65,8 +66,9 @@
   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:     
ftp://ftp.openpkg.org/sources/CPY/corefonts/corefonts-%{V_corefonts}.tar
  -Source14:     fonts-free.txt
  -Source15:     fonts-free.conf
  +Source14:     
http://switch.dl.sourceforge.net/linuxlibertine/LinLibertineFont-%{V_libertine}.tgz
  +Source15:     fonts-free.txt
  +Source16:     fonts-free.conf
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -154,6 +156,11 @@
           url       = ftp://ftp.openpkg.org/sources/CPY/corefonts/
           regex     = corefonts-(__VER__)\.tar
       }
  +    prog fonts-free:libertine = {
  +        version   = %{V_libertine}
  +        url       = http://prdownloads.sourceforge.net/linuxlibertine/
  +        regex     = LinLibertineFont-(__VER__)\.tgz
  +    }
   
   %prep
       %setup -q -T -c
  @@ -171,6 +178,7 @@
       %setup -q -T -D -a 11
       %setup -q -T -D -a 12
       %setup -q -T -D -a 13
  +    %setup -q -T -D -a 14
   
   %build
   
  @@ -271,6 +279,16 @@
       cp  corefonts/*.ttf \
           $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/CoreFonts/
   
  +    #   install font: Linux Libertine
  +    %{l_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/LinLibertine
  +    ( cd LinLibertineFont
  +      for font in LinLibertine*; do
  +          font2=`echo $font | sed -e 's;-[0-9]\.[0-9]\.[0-9]\.;.;'`
  +          cp $font 
$RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/LinLibertine/$font2
  +      done
  +    ) || exit $?
  +
       #   hook into fontconfig(1)
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fontconfig/conf.avail \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/fonts-free/fonts-free.txt
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 fonts-free.txt
  --- openpkg-src/fonts-free/fonts-free.txt     2 Feb 2008 16:44:28 -0000       
1.3
  +++ openpkg-src/fonts-free/fonts-free.txt     21 Aug 2008 09:03:26 -0000      
1.4
  @@ -69,3 +69,8 @@
       Publisher: Microsoft
       Author:    (various)
   
  +  o Font:      Linux Libertine
  +    Homepage:  http://linuxlibertine.sourceforge.net/Libertine-EN.html
  +    Publisher: Linux Libertine Project
  +    Author:    Linux Libertine Project
  +
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to