commit 27d4c6b5852327cfccbbbb3403ada1c91cc9020a Author: प्रविण सातपुते pravin.d.s@gmail.com Date: Tue Oct 12 14:28:33 2010 +0530
- Building from sources, applying Monospace font patch bug 620273
.gitignore | 1 + bug-620273.patch | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ generate.pe | 19 +++++++++ liberation-fonts.spec | 29 ++++++++++---- sources | 2 +- 5 files changed, 147 insertions(+), 9 deletions(-) --- diff --git a/.gitignore b/.gitignore index dbca715..e848ade 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ liberation-fonts-ttf-1.05.3.20100510.tar.gz liberation-fonts-ttf-1.06.0.20100721.tar.gz +/liberation-fonts-1.06.0.20100721.tar.gz diff --git a/bug-620273.patch b/bug-620273.patch new file mode 100644 index 0000000..68506eb --- /dev/null +++ b/bug-620273.patch @@ -0,0 +1,105 @@ +diff -rup liberation-fonts-1.06.0.20100721/src/LiberationMono-BoldItalic.sfd liberation-fonts-1.06.0.20100721_mod/src/LiberationMono-BoldItalic.sfd +--- liberation-fonts-1.06.0.20100721/src/LiberationMono-BoldItalic.sfd 2010-07-21 19:59:58.000000000 +0530 ++++ liberation-fonts-1.06.0.20100721_mod/src/LiberationMono-BoldItalic.sfd 2010-10-12 12:18:28.000000000 +0530 +@@ -20,7 +20,7 @@ OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1095817380 +-ModificationTime: 1273479320 ++ModificationTime: 1280703529 + PfmFamily: 17 + TTFWeight: 700 + TTFWidth: 5 +@@ -2845,8 +2845,8 @@ BeginChars: 1114127 669 + + StartChar: .notdef + Encoding: 1114112 -1 0 +-Width: 748 +-Flags: W ++Width: 1229 ++Flags: HW + TtInstrs: + PUSHB_2 + 1 +diff -rup liberation-fonts-1.06.0.20100721/src/LiberationMono-Bold.sfd liberation-fonts-1.06.0.20100721_mod/src/LiberationMono-Bold.sfd +--- liberation-fonts-1.06.0.20100721/src/LiberationMono-Bold.sfd 2010-07-21 19:59:58.000000000 +0530 ++++ liberation-fonts-1.06.0.20100721_mod/src/LiberationMono-Bold.sfd 2010-10-12 12:18:28.000000000 +0530 +@@ -20,7 +20,7 @@ OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1095817380 +-ModificationTime: 1273478962 ++ModificationTime: 1280703506 + PfmFamily: 17 + TTFWeight: 700 + TTFWidth: 5 +@@ -3228,14 +3228,14 @@ NameList: Adobe Glyph List + 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 +diff -rup liberation-fonts-1.06.0.20100721/src/LiberationMono-Italic.sfd liberation-fonts-1.06.0.20100721_mod/src/LiberationMono-Italic.sfd +--- liberation-fonts-1.06.0.20100721/src/LiberationMono-Italic.sfd 2010-07-21 19:59:58.000000000 +0530 ++++ liberation-fonts-1.06.0.20100721_mod/src/LiberationMono-Italic.sfd 2010-10-12 12:18:28.000000000 +0530 +@@ -20,7 +20,7 @@ OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1095817380 +-ModificationTime: 1273479577 ++ModificationTime: 1280703479 + PfmFamily: 17 + TTFWeight: 400 + TTFWidth: 5 +@@ -3414,13 +3414,13 @@ NameList: Adobe Glyph List + 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 +diff -rup liberation-fonts-1.06.0.20100721/src/LiberationMono-Regular.sfd liberation-fonts-1.06.0.20100721_mod/src/LiberationMono-Regular.sfd +--- liberation-fonts-1.06.0.20100721/src/LiberationMono-Regular.sfd 2010-07-21 19:59:58.000000000 +0530 ++++ liberation-fonts-1.06.0.20100721_mod/src/LiberationMono-Regular.sfd 2010-10-12 12:18:28.000000000 +0530 +@@ -20,7 +20,7 @@ OS2Version: 3 + OS2_WeightWidthSlopeOnly: 0 + OS2_UseTypoMetrics: 1 + CreationTime: 1095817380 +-ModificationTime: 1273478721 ++ModificationTime: 1280703432 + PfmFamily: 17 + TTFWeight: 400 + TTFWidth: 5 +@@ -3213,8 +3213,8 @@ BeginChars: 1114127 669 + + StartChar: .notdef + Encoding: 1114112 -1 0 +-Width: 748 +-Flags: W ++Width: 1229 ++Flags: HW + TtInstrs: + PUSHB_2 + 1 diff --git a/generate.pe b/generate.pe new file mode 100644 index 0000000..bf9bcb2 --- /dev/null +++ b/generate.pe @@ -0,0 +1,19 @@ +#!/usr/bin/env fontforge + +# script file for FontForge for TTF generation +# usage: +# mkdir TTFfiles +# chmod +x generate.pe +# ./generate.pe *.sfd + +if ($version < "20061220") + Error("Your version of FontForge is too old - 20061220 or newer is required"); +endif +i = 1 +while ( i < $argc ) + Open($argv[i], 1) + #Use gen_flags=Defualt fmflags value as -1 + gen_flags = -1 + Generate("" + $fontname + ".ttf", "", gen_flags) + i++ +endloop diff --git a/liberation-fonts.spec b/liberation-fonts.spec index bf26bc9..8897bb3 100644 --- a/liberation-fonts.spec +++ b/liberation-fonts.spec @@ -10,7 +10,7 @@ New. Name: %{fontname}-fonts Summary: Fonts to replace commonly used Microsoft Windows fonts Version: 1.06.0.20100721 -Release: 1%{?dist} +Release: 2%{?dist} # The license of the Liberation Fonts is a EULA that contains GPLv2 and two # exceptions: # The first exception is the standard FSF font exception. @@ -19,12 +19,14 @@ Release: 1%{?dist} License: Liberation Group: User Interface/X URL: http://fedorahosted.org/liberation-fonts/ -Source0: https://fedorahosted.org/releases/l/i/liberation-fonts/%%7Bname%7D-ttf-%%7Bv... +Source0: https://fedorahosted.org/releases/l/i/liberation-fonts/%%7Barchivename%7D.ta... +Source1: generate.pe
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch BuildRequires: fontpackages-devel >= 1.13, xorg-x11-font-utils BuildRequires: fontforge >= 20090408 +Patch1: bug-620273.patch
%description %common_desc @@ -62,7 +64,7 @@ Requires: %{fontname}-fonts-common = %{version}-%{release}
This is Sans-serif TrueType fonts that replaced commonly used Microsoft Arial.
-%_font_pkg -n sans LiberationSans-*.ttf +%_font_pkg -n sans LiberationSans.ttf LiberationSans-*.ttf
%package -n %{fontname}-serif-fonts Summary: Serif fonts to replace commonly used Microsoft Times New Roman @@ -75,7 +77,7 @@ Requires: %{fontname}-fonts-common = %{version}-%{release} This is Serif TrueType fonts that replaced commonly used Microsoft Times New \ Roman.
-%_font_pkg -n serif LiberationSerif-*.ttf +%_font_pkg -n serif LiberationSerif*.ttf
%package -n %{fontname}-mono-fonts Summary: Monospace fonts to replace commonly used Microsoft Courier New @@ -88,7 +90,7 @@ Requires: %{fontname}-fonts-common = %{version}-%{release} This is Monospace TrueType fonts that replaced commonly used Microsoft Courier \ New.
-%_font_pkg -n mono LiberationMono-*.ttf +%_font_pkg -n mono LiberationMono*.ttf
%package -n %{fontname}-narrow-fonts Summary: Sans-serif Narrow fonts to replace commonly used Microsoft Arial Narrow @@ -101,13 +103,20 @@ Requires: %{fontname}-fonts-common = %{version}-%{release} This is Sans-Serif Narrow TrueType fonts that replaced commonly used Microsoft \ Arial Narrow.
-%_font_pkg -n narrow LiberationSansNarrow-*.ttf +%_font_pkg -n narrow LiberationSansNarrow*.ttf
%prep -%setup -q -n %{name}-ttf-%{version} +%setup -q -n %{archivename} +%patch1 -p1 -b .1-fixed-mono-fonts-width +rm -rf scripts +mv src/* . +rm -rf src +cp %{SOURCE1} . +chmod 755 generate.pe
%build -%{nil} +./generate.pe *.sfd +
%install %__rm -rf %{buildroot} @@ -125,6 +134,10 @@ mkfontscale %{buildroot}%{_fontdir} %__rm -rf %{buildroot}
%changelog +* Tue Oct 12 2010 Pravin Satpute psatpute@redhat.com - 1.06.0.20100721-2 +- Building from sources +- Applying Monospace font patch bug 620273 + * Thu Jul 22 2010 Pravin Satpute psatpute@redhat.com - 1.06.0.20100721-1 - Upstream New Release - Added New Family Narrow diff --git a/sources b/sources index 567d928..3948009 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca4870d899fd7e943ffc310a5421ad4d liberation-fonts-ttf-1.06.0.20100721.tar.gz +2f45bd873ab48cf0c3a00fbd350c0e80 liberation-fonts-1.06.0.20100721.tar.gz
fonts-bugs@lists.fedoraproject.org