From f157565de31d773ab178d36d9da8681265efdd09 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Wed, 15 Jul 2009 06:03:06 +0000
Subject: [PATCH] Upgrade to 4.4.1 Fix to match current font guidelines

---
 .cvsignore                            |  2 +-
 linux-libertine-fonts-fontconfig.conf | 10 ++++
 linux-libertine-fonts.spec            | 83 ++++++++++++---------------
 sources                               |  2 +-
 4 files changed, 50 insertions(+), 47 deletions(-)
 create mode 100644 linux-libertine-fonts-fontconfig.conf

diff --git a/.cvsignore b/.cvsignore
index 63869c2..f43f9d4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-LinLibertineSRC-4.1.8.tgz
+LinLibertineSRC-4.4.1.tgz
diff --git a/linux-libertine-fonts-fontconfig.conf b/linux-libertine-fonts-fontconfig.conf
new file mode 100644
index 0000000..05670b6
--- /dev/null
+++ b/linux-libertine-fonts-fontconfig.conf
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>Linux Libertine</family>
+    <accept>
+      <family>Linux Libertine O</family>
+    </accept>
+  </alias>
+</fontconfig>
diff --git a/linux-libertine-fonts.spec b/linux-libertine-fonts.spec
index 9b348f3..b5cc283 100644
--- a/linux-libertine-fonts.spec
+++ b/linux-libertine-fonts.spec
@@ -1,33 +1,35 @@
-%define archivename     LinLibertineSRC
-%define fontdir         %{_datadir}/fonts/linux-libertine
-
-
-Name:          linux-libertine-fonts
-Version:       4.1.8
-Release:       3%{?dist}
-Summary:       Linux Libertine Open Fonts
-Group:         User Interface/X
-License:       GPLv2+ with exceptions or OFL
-URL:           http://linuxlibertine.sf.net
-Source:        http://dl.sf.net/linuxlibertine/%{archivename}-%{version}.tgz
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:     noarch
-BuildRequires: fontforge
-
+%global fontname linux-libertine
+%global fontconf 75-%{fontname}.conf
+%global archivename     LinLibertineSRC
+
+Name:           %{fontname}-fonts
+Version:        4.4.1
+Release:        1%{?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
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildArch:      noarch
+BuildRequires:  fontpackages-devel
+BuildRequires:  fontforge
+Requires:       fontpackages-filesystem
 
 %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.
 
-
 %prep
 %setup -q -n %{archivename}
 sed -i -e 's/\r//' OFL.txt
 
-
 %build
-fontforge -script "-" *.sfd <<EOF
+fontforge -lang=ff -script "-" *.sfd <<EOF
 i = 1
 while (i < \$argc)
   Open(\$argv[i], 1)
@@ -46,39 +48,30 @@ while (i < \$argc)
 endloop
 EOF
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d -m 0755 $RPM_BUILD_ROOT%{fontdir}
-install -p -m 0644 *.ttf $RPM_BUILD_ROOT%{fontdir}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-if [ -x %{_bindir}/fc-cache ]; then
-  %{_bindir}/fc-cache %{fontdir} || :
-fi
+rm -fr %{buildroot}
+install -m 0755 -d %{buildroot}%{_fontdir}
+install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
 
+install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
+                   %{buildroot}%{_fontconfig_confdir}
 
-%postun
-if [ $1 -eq 0 ]; then
-  if [ -x %{_bindir}/fc-cache ]; then
-    %{_bindir}/fc-cache %{fontdir} || :
-  fi
-fi
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
+%clean
+rm -fr %{buildroot}
 
-%files
-%defattr(644,root,root,755)
-%doc Readme *.txt
-%dir %{fontdir}
-%{fontdir}/*.ttf
-
+%_font_pkg -f %{fontconf} *.ttf
+%doc OFL.txt GPL.txt ChangeLog.txt LICENCE.txt Readme Readme-TEX.txt
 
 %changelog
+* Tue Jul 14 2009 Kevin Fenzi <kevin@tummy.com> - 4.4.1-1
+- Upgrade to 4.4.1
+- Fix to match current font guidelines
+
 * Sun Mar 15 2009 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 4.1.8-3
 — Make sure F11 font packages have been built with F11 fontforge
 
diff --git a/sources b/sources
index b1a184e..2180ba3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7357378dc803cf6a2823cae032caf24  LinLibertineSRC-4.1.8.tgz
+a0fc3c60fcfdc6b7261f746043efe980  LinLibertineSRC-4.4.1.tgz