[liberation-fonts] First upstream release with OFL license

Pravin Satpute pravins at fedoraproject.org
Thu Jul 26 16:08:29 UTC 2012


commit 416b3e7a177ce17b7b31e4507f03389e201ad5e2
Author: प्रविण सातपुते <psatpute at redhat.com>
Date:   Thu Jul 26 21:38:09 2012 +0530

    First upstream release with OFL license

 .gitignore               |    1 +
 59-liberation-fonts.conf |   29 --
 59-liberation-mono.conf  |   46 +++
 59-liberation-sans.conf  |   16 +
 59-liberation-serif.conf |   16 +
 bug-714191.patch         |   44 ---
 bug-715309.patch         |  243 --------------
 bug-835182.patch         |  781 ----------------------------------------------
 liberation-fonts.spec    |   81 +++---
 sources                  |    2 +-
 10 files changed, 118 insertions(+), 1141 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 741cafa..f5ab55d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ liberation-fonts-ttf-1.06.0.20100721.tar.gz
 /liberation-fonts-1.07.0.tar.gz
 /liberation-fonts-1.07.1.tar.gz
 /liberation-fonts-1.07.2.tar.gz
+/liberation-fonts-2.00.0.tar.gz
diff --git a/59-liberation-mono.conf b/59-liberation-mono.conf
new file mode 100644
index 0000000..d96e5a1
--- /dev/null
+++ b/59-liberation-mono.conf
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Liberation Sans Narrow</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Liberation Sans Narrow</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+
+  <match target="font">
+    <test name="family" ignore-blanks="true">
+	<string>Liberation Mono</string>
+    </test>
+    <edit name="autohint" mode="assign">
+	<bool>false</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+	<bool>true</bool>
+    </edit>
+
+  </match>
+  <match target="font">
+    <test name="family" ignore-blanks="true">
+	<string>Liberation Mono</string>
+    </test>
+    <test name="pixelsize" compare="less_eq">
+	<double>17</double>
+    </test>
+    <test name="pixelsize" compare="more">
+	<double>8</double>
+    </test>
+    <edit name="autohint" mode="assign">
+	<bool>true</bool>
+    </edit>
+    <edit name="hinting" mode="assign">
+	<bool>false</bool>
+    </edit>
+  </match>
+</fontconfig>
diff --git a/59-liberation-sans.conf b/59-liberation-sans.conf
new file mode 100644
index 0000000..528d872
--- /dev/null
+++ b/59-liberation-sans.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Liberation Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Liberation Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/59-liberation-serif.conf b/59-liberation-serif.conf
new file mode 100644
index 0000000..fdbe20d
--- /dev/null
+++ b/59-liberation-serif.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Liberation Sans Narrow</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Liberation Sans Narrow</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/liberation-fonts.spec b/liberation-fonts.spec
index 7ec4056..2af905a 100644
--- a/liberation-fonts.spec
+++ b/liberation-fonts.spec
@@ -1,5 +1,6 @@
-%define fontname liberation
-%define archivename %{name}-%{version}
+%global fontname liberation
+%global fontconf59 59-%{fontname}
+%global archivename %{name}-%{version}
 %define common_desc \
 The Liberation Fonts are intended to be replacements for the three most \
 commonly used fonts on Microsoft systems: Times New Roman, Arial, and Courier \
@@ -9,25 +10,19 @@ New.
 
 Name:             %{fontname}-fonts
 Summary:          Fonts to replace commonly used Microsoft Windows fonts
-Version:          1.07.2
-Release:          7%{?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.
-# The second exception is an anti-lockdown clause somewhat like the one in
-# GPLv3. This license is Free, but GPLv2 and GPLv3 incompatible.
-License:          Liberation
+Version:          2.00.0
+Release:          1%{?dist}
+License:          OFL
 Group:            User Interface/X
 URL:              http://fedorahosted.org/liberation-fonts/
 Source0:          https://fedorahosted.org/releases/l/i/liberation-fonts/%{archivename}.tar.gz
 Source1:          generate.pe
-BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Source2:          59-liberation-mono.conf
+Source3:          59-liberation-sans.conf
+Source4:          59-liberation-serif.conf
 BuildArch:        noarch
 BuildRequires:    fontpackages-devel >= 1.13, xorg-x11-font-utils
-BuildRequires:    fontforge >= 20090408
-Patch1: bug-715309.patch
-Patch2: bug-714191.patch
-Patch3: bug-835182.patch
+BuildRequires:    fontforge
 
 %description
 %common_desc
@@ -49,7 +44,7 @@ Shared common files of Liberation font families.
 
 %files -n %{fontname}-fonts-common
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING License.txt README TODO
+%doc AUTHORS ChangeLog LICENSE README TODO
 %dir %{_fontdir}
 %verify(not md5 size mtime) %{_fontdir}/fonts.dir
 %verify(not md5 size mtime) %{_fontdir}/fonts.scale
@@ -65,7 +60,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 -f *-%{fontname}-sans.conf  LiberationSans-*.ttf
 
 %package -n %{fontname}-serif-fonts
 Summary:      Serif fonts to replace commonly used Microsoft Times New Roman
@@ -78,7 +73,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 -f *-%{fontname}-serif.conf  LiberationSerif*.ttf
 
 %package -n %{fontname}-mono-fonts
 Summary:      Monospace fonts to replace commonly used Microsoft Courier New
@@ -91,31 +86,15 @@ Requires:     %{fontname}-fonts-common = %{version}-%{release}
 This is Monospace TrueType fonts that replaced commonly used Microsoft Courier \
 New.
 
-%_font_pkg -n mono LiberationMono*.ttf
-
-%package -n %{fontname}-narrow-fonts
-Summary:      Sans-serif Narrow fonts to replace commonly used Microsoft Arial Narrow
-Group:        User Interface/X
-Requires:     %{fontname}-fonts-common = %{version}-%{release}
-
-%description -n %{fontname}-narrow-fonts
-%common_desc
-
-This is Sans-Serif Narrow TrueType fonts that replaced commonly used Microsoft \
-Arial Narrow.
-
-%_font_pkg -n narrow LiberationSansNarrow*.ttf
+%_font_pkg -n mono -f *-%{fontname}-mono.conf  LiberationMono*.ttf
 
 %prep
 %setup -q -n %{archivename}
 rm -rf scripts
 mv src/* .
 rm -rf src
-cp %{SOURCE1} .
+cp -p %{SOURCE1} .
 chmod 755 generate.pe
-%patch1 -p1 -b .1-resolved-u-hinting-bug
-%patch2 -p1 -b .2-removed-kerning-for-11-pair
-%patch3 -p1 -b .3-updated-patch-for-fix-u040D
 
 %build
 ./generate.pe *.sfd
@@ -125,23 +104,39 @@ mv LiberationSans.ttf LiberationSans-Regular.ttf
 
 
 %install
-%__rm -rf %{buildroot}
 # fonts .ttf
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 # catalogue
 install -m 0755 -d %{buildroot}%{catalogue}
-%__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{name}
+ln -s %{_fontdir} %{buildroot}%{catalogue}/%{name}
+
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
+
+# Repeat for every font family
+install -m 0644 -p %{SOURCE2} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf59}-mono.conf
+install -m 0644 -p %{SOURCE3} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf59}-sans.conf
+install -m 0644 -p %{SOURCE4} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf59}-serif.conf
+
+for fconf in %{fontconf59}-mono.conf \
+             %{fontconf59}-sans.conf \
+             %{fontconf59}-serif.conf; do
+  ln -s %{_fontconfig_templatedir}/$fconf \
+        %{buildroot}%{_fontconfig_confdir}/$fconf
+done
+
 # fonts.{dir,scale}
 mkfontdir %{buildroot}%{_fontdir}
 mkfontscale %{buildroot}%{_fontdir}
 
-%clean
-%__rm -rf %{buildroot}
-
 %changelog
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Thu Jul 26 2012 Pravin Satpute <psatpute at redhat.com> - 2.00.0-1
+- First upstream release with OFL license
+- Added conf files with 59 priority
 
 * Tue Jun 26 2012 Pravin Satpute <psatpute at redhat.com> - 1.07.2-6
 - Resolves bug 835182
diff --git a/sources b/sources
index e1b5f2e..05be11e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-293b364f3de019f0b19ddd54d36737e6  liberation-fonts-1.07.2.tar.gz
+5b5055ed755025891f908b7726fea482  liberation-fonts-2.00.0.tar.gz


More information about the fonts-bugs mailing list