浏览代码

use newer version of Liberation (from Fedora)

Ralf S. Engelschall 17 年之前
父节点
当前提交
7c3b89691c
共有 2 个文件被更改,包括 9 次插入9 次删除
  1. 7 8
      fonts-free/fonts-free.spec
  2. 2 1
      fonts-free/fonts-free.txt

+ 7 - 8
fonts-free/fonts-free.spec

@@ -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 @@ Class:        EVAL
 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 @@ AutoReqProv:  no
 %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 @@ AutoReqProv:  no
     }
 
 %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 @@ AutoReqProv:  no
     #   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

+ 2 - 1
fonts-free/fonts-free.txt

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