- rel 1; fix monospace bug (patch from fc); build fonts from sources instead of using...

Changed files:
    fonts-TTF-RedHat-liberation.spec -> 1.20
    rh-bug-620273.patch -> 1.1

diff --git a/fonts-TTF-RedHat-liberation.spec b/fonts-TTF-RedHat-liberation.spec
index 42c0217988c94e411ab50d12fa11014ad2c64312..81f1ff0beef6b1dec96f7807b2f776a34515a4d5 100644 (file)
--- a/fonts-TTF-RedHat-liberation.spec
+++ b/fonts-TTF-RedHat-liberation.spec
@@ -2,15 +2,16 @@ Summary:      Fonts to replace commonly used Microsoft Windows Fonts
 Summary(pl.UTF-8):     Fonty zastępujące popularne fonty z Microsoft Windows
 Name:          fonts-TTF-RedHat-liberation
 Version:       1.06.0.20100721
-# https://bugzilla.redhat.com/show_bug.cgi?id=508899
-Release:       0.1
+Release:       1
 Epoch:         1
 License:       GPL v2 + exceptions
 Group:         Fonts
-Source0:       https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-%{version}.tar.gz
-# Source0-md5: ca4870d899fd7e943ffc310a5421ad4d
+Source0:       https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-%{version}.tar.gz
+# Source0-md5: 2f45bd873ab48cf0c3a00fbd350c0e80
 Source1:       %{name}.fontconfig
+Patch0:                rh-bug-620273.patch
 URL:           https://fedorahosted.org/liberation-fonts/
+BuildRequires: fontforge >= 20090923
 BuildRequires: unzip
 Requires(post,postun): fontpostinst
 Requires:      %{_fontsdir}/TTF
@@ -41,7 +42,11 @@ Mono (zamiennik dla Courier New, Cumberland, Courier, Nimbus Mono L i
 Bitstream Vera Sans Mono).
 
 %prep
-%setup -q -n liberation-fonts-ttf-%{version}
+%setup -q -n liberation-fonts-%{version}
+%patch0 -p0
+
+%build
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -49,7 +54,7 @@ install -d $RPM_BUILD_ROOT%{_ttffontsdir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 
-cp -a *.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
+cp -a liberation-*/*.ttf $RPM_BUILD_ROOT%{_ttffontsdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail/60-liberation.conf
 ln -s ../conf.avail/60-liberation.conf $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 

diff --git a/rh-bug-620273.patch b/rh-bug-620273.patch
new file mode 100644 (file)
index 0000000..ef2c323
--- /dev/null
+++ b/rh-bug-620273.patch
@@ -0,0 +1,101 @@
+--- src/LiberationMono-Bold.sfd        2010-07-21 10:29:58.000000000 -0400
++++ src/LiberationMono-Bold.sfd        2010-08-01 18:58:28.000000000 -0400
+@@ -20,7 +20,7 @@ 
+ OS2_WeightWidthSlopeOnly: 0
+ OS2_UseTypoMetrics: 1
+ CreationTime: 1095817380
+-ModificationTime: 1273478962
++ModificationTime: 1280703506
+ PfmFamily: 17
+ TTFWeight: 700
+ TTFWidth: 5
+@@ -3228,14 +3228,14 @@ 
+ DisplaySize: -24
+ AntiAlias: 1
+ FitToEm: 1
+-WinInfo: 8520 40 16
++WinInfo: 0 40 16
+ TeXData: 1 0 0 346030 173015 115343 553984 -1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
+ BeginChars: 1114127 669
+ 
+ StartChar: .notdef
+ Encoding: 1114112 -1 0
+-Width: 748
+-Flags: W
++Width: 1229
++Flags: HW
+ TtInstrs:
+ PUSHB_2
+  1
+--- src/LiberationMono-BoldItalic.sfd  2010-07-21 10:29:58.000000000 -0400
++++ src/LiberationMono-BoldItalic.sfd  2010-08-01 18:58:52.000000000 -0400
+@@ -20,7 +20,7 @@ 
+ OS2_WeightWidthSlopeOnly: 0
+ OS2_UseTypoMetrics: 1
+ CreationTime: 1095817380
+-ModificationTime: 1273479320
++ModificationTime: 1280703529
+ PfmFamily: 17
+ TTFWeight: 700
+ TTFWidth: 5
+@@ -2845,8 +2845,8 @@ 
+ 
+ StartChar: .notdef
+ Encoding: 1114112 -1 0
+-Width: 748
+-Flags: W
++Width: 1229
++Flags: HW
+ TtInstrs:
+ PUSHB_2
+  1
+--- src/LiberationMono-Italic.sfd      2010-07-21 10:29:58.000000000 -0400
++++ src/LiberationMono-Italic.sfd      2010-08-01 18:58:03.000000000 -0400
+@@ -20,7 +20,7 @@ 
+ OS2_WeightWidthSlopeOnly: 0
+ OS2_UseTypoMetrics: 1
+ CreationTime: 1095817380
+-ModificationTime: 1273479577
++ModificationTime: 1280703479
+ PfmFamily: 17
+ TTFWeight: 400
+ TTFWidth: 5
+@@ -3414,13 +3414,13 @@ 
+ DisplaySize: -24
+ AntiAlias: 1
+ FitToEm: 1
+-WinInfo: 8160 40 16
++WinInfo: 0 40 16
+ BeginChars: 1114127 669
+ 
+ StartChar: .notdef
+ Encoding: 1114112 -1 0
+-Width: 748
+-Flags: W
++Width: 1229
++Flags: HW
+ TtInstrs:
+ PUSHB_2
+  1
+--- src/LiberationMono-Regular.sfd     2010-07-21 10:29:58.000000000 -0400
++++ src/LiberationMono-Regular.sfd     2010-08-01 18:57:18.000000000 -0400
+@@ -20,7 +20,7 @@ 
+ OS2_WeightWidthSlopeOnly: 0
+ OS2_UseTypoMetrics: 1
+ CreationTime: 1095817380
+-ModificationTime: 1273478721
++ModificationTime: 1280703432
+ PfmFamily: 17
+ TTFWeight: 400
+ TTFWidth: 5
+@@ -3213,8 +3213,8 @@ 
+ 
+ StartChar: .notdef
+ Encoding: 1114112 -1 0
+-Width: 748
+-Flags: W
++Width: 1229
++Flags: HW
+ TtInstrs:
+ PUSHB_2
+  1