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: 23-Nov-2008 19:57:00
Branch: HEAD Handle: 2008112318565900
Modified files:
openpkg-src/fonts-free fonts-free.spec fonts-free.txt
Log:
use newer version of Liberation (from Fedora)
Summary:
Revision Changes Path
1.26 +7 -8 openpkg-src/fonts-free/fonts-free.spec
1.11 +2 -1 openpkg-src/fonts-free/fonts-free.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/fonts-free/fonts-free.spec
============================================================================
$ cvs diff -u -r1.25 -r1.26 fonts-free.spec
--- openpkg-src/fonts-free/fonts-free.spec 17 Sep 2008 15:56:59 -0000
1.25
+++ openpkg-src/fonts-free/fonts-free.spec 23 Nov 2008 18:56:59 -0000
1.26
@@ -22,7 +22,7 @@
##
# package version
-%define V_liberation 1.0-1
+%define V_liberation 1.04
%define V_vera 1.10
%define V_dejavu 2.26
%define V_cardo 98
@@ -54,10 +54,10 @@
Group: Graphics
License: Open Source
Version: 0
-Release: 20080917
+Release: 20081123
# list of sources
-Source0:
ftp://ftp.openpkg.org/sources/CPY/fonts-free/liberation-fonts-%{V_liberation}.zip
+Source0:
http://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-%{V_liberation}.tar.gz
Source1:
http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/%{V_vera}/ttf-bitstream-vera-%{V_vera}.tar.bz2
Source2:
http://switch.dl.sourceforge.net/dejavu/dejavu-fonts-ttf-%{V_dejavu}.tar.bz2
Source3: http://scholarsfonts.net/cardo%{V_cardo}.zip
@@ -99,8 +99,8 @@
%track
prog fonts-free:liberation = {
version = %{V_liberation}
- url = ftp://ftp.openpkg.org/sources/CPY/fonts-free/
- regex = liberation-fonts-(__VER__)\.zip
+ url = https://fedorahosted.org/releases/l/i/liberation-fonts/
+ regex = liberation-fonts-(__VER__)\.tar\.gz
}
prog fonts-free:vera = {
version = %{V_vera}
@@ -199,8 +199,7 @@
}
%prep
- %setup -q -T -c
- %{l_prefix}/bin/unzip -q -x %{SOURCE0}
+ %setup -q -c
%setup -q -T -D -a 1
%setup -q -T -D -a 2
%{l_prefix}/bin/unzip -q -x %{SOURCE3}
@@ -233,7 +232,7 @@
# install font: Liberation
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Liberation
- cp liberation-fonts/Liberation*.ttf \
+ cp liberation-fonts-*/Liberation*.ttf \
$RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Liberation
# install font: Vera
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fonts-free/fonts-free.txt
============================================================================
$ cvs diff -u -r1.10 -r1.11 fonts-free.txt
--- openpkg-src/fonts-free/fonts-free.txt 7 Sep 2008 08:56:44 -0000
1.10
+++ openpkg-src/fonts-free/fonts-free.txt 23 Nov 2008 18:56:59 -0000
1.11
@@ -4,7 +4,8 @@
o Font: Liberation
Homepage: https://www.redhat.com/promo/fonts/
- Publisher: Red Hat
+ https://fedorahosted.org/liberation-fonts/
+ Publisher: Steve Matteson, Red Hat
Author: Ascender
o Font: Vera
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
