Pārlūkot izejas kodu

modifying package: fonts-free-0 20090327 -> 20090630

Ralf S. Engelschall 16 gadi atpakaļ
vecāks
revīzija
d2279b419f
1 mainītis faili ar 9 papildinājumiem un 7 dzēšanām
  1. 9 7
      fonts-free/fonts-free.spec

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

@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_liberation 1.04.93.devel
+%define       V_liberation 1.05.1.20090630
 %define       V_vera       1.10
 %define       V_dejavu     2.29
 %define       V_cardo      98
@@ -54,10 +54,10 @@ Class:        EVAL
 Group:        Graphics
 License:      Open Source
 Version:      0
-Release:      20090327
+Release:      20090630
 
 #   list of sources
-Source0:      http://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-%{V_liberation}.tar.gz
+Source0:      http://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-%{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
@@ -199,7 +199,9 @@ AutoReqProv:  no
     }
 
 %prep
+    (
     %setup -q -c
+    ) || true
     %setup -q -T -D -a 1
     %setup -q -T -D -a 2
     %{l_prefix}/bin/unzip -q -x %{SOURCE3}
@@ -232,20 +234,20 @@ 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 \
-        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Liberation
+    cp  ttf/Liberation*.ttf \
+        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Liberation/
 
     #   install font: Vera
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Vera
     cp  ttf-bitstream-vera-*/Vera*.ttf \
-        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Vera
+        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Vera/
 
     #   install font: DejaVu
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/DejaVu
     cp  dejavu-fonts-ttf-*/ttf/DejaVu*.ttf \
-        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/DejaVu
+        $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/DejaVu/
 
     #   install font: Cardo
     %{l_shtool} mkdir -f -p -m 755 \