From 087676311723cfc25c3e45b12c1fc4b14d8c7d1d47018c5e02d9dda749ead363 Mon Sep 17 00:00:00 2001
From: Marguerite Su <i@marguerite.su>
Date: Fri, 3 Aug 2012 06:22:18 +0000
Subject: [PATCH] Accepting request 129725 from home:adra:branches:M17N:fonts

Update to version 0.20120503, Use the package scripts for generating the fonts in openSUSE > 11.2

OBS-URL: https://build.opensuse.org/request/show/129725
OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/gnu-free-fonts?expand=0&rev=12
---
 freefont-0.20111101.tar.bz2  |  3 ---
 freefont-src-20120503.tar.gz |  3 +++
 gnu-free-fonts.changes       | 10 ++++++++++
 gnu-free-fonts.spec          | 38 +++++++++++++++++++-----------------
 4 files changed, 33 insertions(+), 21 deletions(-)
 delete mode 100644 freefont-0.20111101.tar.bz2
 create mode 100644 freefont-src-20120503.tar.gz

diff --git a/freefont-0.20111101.tar.bz2 b/freefont-0.20111101.tar.bz2
deleted file mode 100644
index 2332cd2..0000000
--- a/freefont-0.20111101.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef5ac41efaf4f43d466594c2991d18853e5b09663e1ea6335c411e636166f6f6
-size 5343855
diff --git a/freefont-src-20120503.tar.gz b/freefont-src-20120503.tar.gz
new file mode 100644
index 0000000..6e8f66b
--- /dev/null
+++ b/freefont-src-20120503.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d62e2e22655f841c3ac5fb8c8059a52fe2c09c695d9e8eda9903406e942657a
+size 6505962
diff --git a/gnu-free-fonts.changes b/gnu-free-fonts.changes
index f3428a8..d003ed1 100644
--- a/gnu-free-fonts.changes
+++ b/gnu-free-fonts.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Aug  2 21:54:31 UTC 2012 - asterios.dramis@gmail.com
+
+- Update to version 0.20120503:
+  * Lots of changes (see http://savannah.gnu.org/forum/forum.php?forum_id=7216
+    and ChangeLog for details).
+- Use the package scripts for generating the fonts in openSUSE > 11.2. Use the
+  "GenerateTrueType" external script only for older versions (package fails to
+  compile otherwise).
+
 -------------------------------------------------------------------
 Wed Jul  4 12:39:06 CEST 2012 - pgajdos@suse.cz
 
diff --git a/gnu-free-fonts.spec b/gnu-free-fonts.spec
index 53ac405..eb7c513 100644
--- a/gnu-free-fonts.spec
+++ b/gnu-free-fonts.spec
@@ -16,28 +16,26 @@
 #
 
 
-%define fontname    freefont
+%define fontname freefont
+%define fontversion 20120503
 %define _ttfontsdir /usr/share/fonts/truetype
 
 Name:           gnu-free-fonts
-Version:        0.20111101
+Version:        0.%{fontversion}
 Release:        0
 Summary:        Free UCS Outline Fonts
 License:        SUSE-GPL-3.0+-with-font-exception
 Group:          System/X11/Fonts
 Url:            http://savannah.nongnu.org/projects/freefont/
-#    svn co svn://svn.savannah.gnu.org/freefont/trunk/freefont
-#    tar jcvf freefont-0.20080323.tar.bz2 freefont/
-Source0:        %{fontname}-%{version}.tar.bz2
+Source0:        http://ftp.gnu.org/gnu/freefont/%{fontname}-src-%{fontversion}.tar.gz
 Source10:       remove-kana-glyphs
-# TODO: remove GenerateTrueType script from previous version (20080323) as soon as the new one is working
 Source11:       GenerateTrueType
 BuildRequires:  fontforge >= 20080429
 BuildRequires:  fontpackages-devel
 BuildRequires:  python
 %reconfigure_fonts_prereq
-# FIXME: This causes a rpmlint warning; change <= to < once there's a new upstream version
-Obsoletes:      %{fontname} <= 0.20111101
+# freefont was last used at openSUSE 12.1 (version 0.20110523) and at M17N:fonts (version 0.20111101)
+Obsoletes:      %{fontname} < %{version}
 Provides:       %{fontname} = %{version}
 Provides:       scalable-font-bg
 Provides:       scalable-font-el
@@ -54,27 +52,31 @@ typefaces: one monospaced and two proportional (one with uniform and
 one with modulated stroke).
 
 %prep
-%setup -n %{fontname}
-find . -name CVS -type d | xargs rm -rf
-# Fix DOS line endings
-sed -i 's/.$//' papers/eurotex2003/freefont.bib
+%setup -q -n %{fontname}-%{fontversion}
 
 %build
-cp %{SOURCE11} ./tools
 chmod 755 $RPM_SOURCE_DIR/remove-kana-glyphs
 $RPM_SOURCE_DIR/remove-kana-glyphs ./sfd/*.sfd
-fontforge -lang=ff -script ./tools/GenerateTrueType *.sfd
+%if 0%{?suse_version} > 1120
+make ttf
+%else
+cp %{SOURCE11} ./tools
+fontforge -lang=ff -script ./tools/GenerateTrueType ./sfd/*.sfd
+%endif
 
 %install
 mkdir -p %{buildroot}%{_ttfontsdir}/
-install -c -m 644 *.ttf %{buildroot}%{_ttfontsdir}/
+%if 0%{?suse_version} > 1120
+install -pm 0644 sfd/*.ttf %{buildroot}%{_ttfontsdir}/
+%else
+install -pm 0644 *.ttf %{buildroot}%{_ttfontsdir}/
+%endif
 
 %reconfigure_fonts_scriptlets
 
 %files
-%defattr(-, root,root)
-%doc AUTHORS CREDITS ChangeLog README
-%doc papers/
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING CREDITS ChangeLog README notes/troubleshooting.txt notes/usage.txt
 %{_ttfontsdir}
 
 %changelog