commit 96d1abe5b4468e1b0d58cbf180ba3518bdce2fd4
Author: Akira TAGOH <ta...@redhat.com>
Date: Thu Feb 17 20:18:38 2011 +0900
- Improve the spec file to meet the packaging guidelines. (#477418)
- Updates to 4.7.5-2 (#628540)
... linux-libertine-fonts-biolinum-fontconfig.conf | 10 +-
linux-libertine-fonts-libertine-fontconfig.conf | 30 ++++++
linux-libertine-fonts.spec | 100 +++++++++++++-------
3 files changed, 102 insertions(+), 38 deletions(-)
---
diff --git a/linux-libertine-fonts-fontconfig.conf
b/linux-libertine-fonts-biolinum-fontconfig.conf
similarity index 51%
rename from linux-libertine-fonts-fontconfig.conf
rename to linux-libertine-fonts-biolinum-fontconfig.conf
index 05670b6..8112218 100644
--- a/linux-libertine-fonts-fontconfig.conf
+++ b/linux-libertine-fonts-biolinum-fontconfig.conf
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
<fontconfig>
+ <!-- Generic names -->
<alias>
- <family>Linux Libertine</family>
- <accept>
- <family>Linux Libertine O</family>
- </accept>
+ <family>Linux Biolinum</family>
+ <default>
+ <family>sans-serif</family>
+ </default>
</alias>
</fontconfig>
+
diff --git a/linux-libertine-fonts-libertine-fontconfig.conf
b/linux-libertine-fonts-libertine-fontconfig.conf
new file mode 100644
index 0000000..ac3657f
--- /dev/null
+++ b/linux-libertine-fonts-libertine-fontconfig.conf
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+ <!-- Generic names -->
+ <alias>
+ <family>Linux Libertine</family>
+ <default>
+ <family>serif</family>
+ </default>
+ </alias>
+ <!-- Font substitution -->
+ <alias binding="same">
+ <family>Times Roman</family>
+ <accept>
+ <family>Linux Libertine</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>Times New Roman</family>
+ <accept>
+ <family>Linux Libertine</family>
+ </accept>
+ </alias>
+ <alias binding="same">
+ <family>Linux Libertine O</family>
+ <accept>
+ <family>Linux Libertine</family>
+ </accept>
+ </alias>
+</fontconfig>
diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec
index 11d70c0..f1ca6b4 100644
--- a/linux-libertine-fonts.spec
+++ b/linux-libertine-fonts.spec
@@ -1,52 +1,70 @@
-%global fontname linux-libertine
-%global fontconf 75-%{fontname}.conf
-%global archivename LinLibertineSRC
+%global fontname linux-libertine
+%global prio_libertine 60
+%global prio_biolinum 61
+%global fontconf_libertine %{prio_libertine}-%{fontname}-libertine.conf
+%global fontconf_biolinum %{prio_biolinum}-%{fontname}-biolinum.conf
+%global archivename LinLibertine
+%define posttag 2
+
+%define common_desc \
+The Linux Libertine Open Fonts are a TrueType font family for practical \
+use in documents. They were created to provide a free alternative to \
+proprietary standard fonts.
Name: %{fontname}-fonts
-Version: 4.4.1
-Release: 3%{?dist}
+Version: 4.7.5
+Release: 1.%{posttag}%{?dist}
Summary: Linux Libertine Open Fonts
Group: User Interface/X
License: GPLv2+ with exceptions or OFL
URL: http://linuxlibertine.sf.net
-Source0:
http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC-4.4.1.tgz
-Source1: %{name}-fontconfig.conf
+Source0:
http://download.sourceforge.net/sourceforge/linuxlibertine/LinLibertineSRC-%{version}-%{posttag}.tgz
+Source1: %{name}-libertine-fontconfig.conf
+Source2: %{name}-biolinum-fontconfig.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
BuildRequires: fontpackages-devel
BuildRequires: fontforge
-Requires: fontpackages-filesystem
+Requires: %{name}-common = %{version}-%{release}
%description
-The Linux Libertine Open Fonts are a TrueType font family for practical
-use in documents. They were created to provide a free alternative to
-proprietary standard fonts.
+%common_desc
+
+This package contains Serif fonts.
+
+%package -n %{fontname}-biolinum-fonts
+Summary: Sans-serif fonts from Linux Libertine Open Fonts
+Requires: %{name}-common = %{version}-%{release}
+Group: User Interface/X
+
+%description -n %{fontname}-biolinum-fonts
+%common_desc
+
+This package contains Sans fonts.
+
+%package common
+Summary: Common files for Linux Libertine Open Fonts
+Requires: fontpackages-filesystem
+Group: User Interface/X
+
+%description common
+%common_desc
+
+This package consists of files used by other %{name} packages.
%prep
%setup -q -n %{archivename}
sed -i -e 's/\r//' OFL.txt
%build
-fontforge -lang=ff -script "-" *.sfd <<EOF
-i = 1
-while (i < \$argc)
- Open(\$argv[i], 1)
- fontname = StrJoin(StrSplit(\$fontname, "O"), "")
- familyname = StrJoin(StrSplit(\$familyname, " O"), "")
- fullname = StrJoin(StrSplit(\$fullname, " O"), "")
- SetFontNames(fontname, familyname, fullname)
- ScaleToEm(2048)
- RoundToInt()
- SetFontOrder(2)
- SelectAll()
- AutoInstr()
- Generate(\$fontname + ".ttf")
- Close()
- i++
-endloop
-EOF
+for i in $(find -name '*.sfd'); do
+ (cd scripts;
+ ./bailly-2.sh "../$i" ttf
+ )
+done
+mv scripts/*.ttf .
%install
rm -fr %{buildroot}
@@ -57,17 +75,31 @@ install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
%{buildroot}%{_fontconfig_confdir}
install -m 0644 -p %{SOURCE1} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
-ln -s %{_fontconfig_templatedir}/%{fontconf} \
- %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf_libertine}
+install -m 0644 -p %{SOURCE1} \
+ %{buildroot}%{_fontconfig_templatedir}/%{fontconf_biolinum}
+
+for fconf in %{fontconf_libertine} %{fontconf_biolinum}; do
+ ln -s %{_fontconfig_templatedir}/$fconf \
+ %{buildroot}%{_fontconfig_confdir}/$fconf
+done
%clean
rm -fr %{buildroot}
-%_font_pkg -f %{fontconf} *.ttf
-%doc OFL.txt GPL.txt ChangeLog.txt LICENCE.txt Readme Readme-TEX.txt
+%files common
+%defattr(0644, root, root, 0755)
+%doc Bugs.txt ChangeLog.txt GPL.txt LICENCE.txt OFL.txt Readme-TEX.txt
Readme.txt
+
+%_font_pkg -f %{fontconf_libertine} LinLibertine*.ttf
+
+%_font_pkg -n biolinum -f %{fontconf_biolinum} LinBiolinum*.ttf
%changelog
+* Thu Feb 17 2011 Akira TAGOH <ta...@redhat.com> - 4.4.1-4
+- Improve the spec file to meet the packaging guidelines. (#477418)
+- Updates to 4.7.5-2 (#628540)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-...@lists.fedoraproject.org>
- 4.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
_______________________________________________
fonts-bugs mailing list
fonts-bugs@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/fonts-bugs
http://fonts.fedoraproject.org/
