|
|
@@ -25,8 +25,7 @@
|
|
|
%define V_liberation 1.06.0.20100721
|
|
|
%define V_vera 1.10
|
|
|
%define V_dejavu 2.33
|
|
|
-%define V_cardo 99
|
|
|
-%define V_cardoita 99
|
|
|
+%define V_cardo 104
|
|
|
%define V_gentium 110
|
|
|
%define V_lido 20050821
|
|
|
%define V_union 20030604
|
|
|
@@ -76,7 +75,7 @@ Class: EVAL
|
|
|
Group: Graphics
|
|
|
License: Open Source
|
|
|
Version: 0
|
|
|
-Release: 20110327
|
|
|
+Release: 20110421
|
|
|
|
|
|
# list of sources
|
|
|
Source0: http://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-%{V_liberation}.tar.gz
|
|
|
@@ -122,9 +121,8 @@ Source39: http://www.dotcolon.net/DL/font/vegur_L_R_M_B_%{V_vegur}.zip
|
|
|
Source40: http://download.openpkg.org/components/versioned/fonts-free/tiresias-%{V_tiresias}.tar.gz
|
|
|
Source41: http://download.openpkg.org/components/versioned/fonts-free/Amble-%{V_amble}.tar.gz
|
|
|
Source42: http://font.ubuntu.com/download/ubuntu-font-family-%{V_ubuntu}+ufl.zip
|
|
|
-Source43: http://scholarsfonts.net/cardoita%{V_cardoita}.zip
|
|
|
-Source44: fonts-free.txt
|
|
|
-Source45: fonts-free.conf
|
|
|
+Source43: fonts-free.txt
|
|
|
+Source44: fonts-free.conf
|
|
|
|
|
|
# build information
|
|
|
BuildPreReq: OpenPKG, openpkg >= 20100101, cabextract, xz
|
|
|
@@ -160,11 +158,6 @@ PreReq: OpenPKG, openpkg >= 20100101, fontconfig
|
|
|
url = http://scholarsfonts.net/cardofnt.html
|
|
|
regex = cardo(\d+)\.zip
|
|
|
}
|
|
|
- prog fonts-free:cardoita = {
|
|
|
- version = %{V_cardoita}
|
|
|
- url = http://scholarsfonts.net/cardofnt.html
|
|
|
- regex = cardoita(\d+)\.zip
|
|
|
- }
|
|
|
prog fonts-free:gentium = {
|
|
|
version = %{V_gentium}
|
|
|
url = http://download.openpkg.org/components/versioned/fonts-free/
|
|
|
@@ -374,7 +367,6 @@ PreReq: OpenPKG, openpkg >= 20100101, fontconfig
|
|
|
%setup -q -T -D -a 40
|
|
|
%setup -q -T -D -a 41
|
|
|
%setup -q -T -D -a 42
|
|
|
- %setup -q -T -D -a 43
|
|
|
|
|
|
%build
|
|
|
|
|
|
@@ -408,10 +400,12 @@ PreReq: OpenPKG, openpkg >= 20100101, fontconfig
|
|
|
# install font: Cardo
|
|
|
%{l_shtool} mkdir -f -p -m 755 \
|
|
|
$RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Cardo
|
|
|
- cp Cardo99s.ttf \
|
|
|
+ cp Cardo104s.ttf \
|
|
|
$RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Cardo/Cardo.ttf
|
|
|
cp Cardoi99.ttf \
|
|
|
$RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Cardo/CardoI.ttf
|
|
|
+ cp Cardob101.ttf \
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/share/fonts-free/Cardo/CardoB.ttf
|
|
|
|
|
|
# install font: Gentium
|
|
|
%{l_shtool} mkdir -f -p -m 755 \
|
