From 3547db8ae663b2ca981d1ce8c9d33e76f456faf2 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Fri, 28 Sep 2012 14:40:54 -0500
Subject: [PATCH] 20120503

---
 .gitignore          |  1 +
 gnu-free-fonts.spec | 36 +++++++++++-------------------------
 sources             |  2 +-
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 184e0b2..d5d6f0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 freefont-sfd-20090104.tar.gz
 /freefont-sfd-20100919.tar.gz
+/freefont-src-20120503.tar.gz
diff --git a/gnu-free-fonts.spec b/gnu-free-fonts.spec
index 1b0610f..f83739c 100644
--- a/gnu-free-fonts.spec
+++ b/gnu-free-fonts.spec
@@ -2,15 +2,14 @@
 %global fontconf 67-%{fontname}
 
 Name:      %{fontname}-fonts
-Version:   20100919
-Release:   6%{?dist}
+Version:   20120503
+Release:   1%{?dist}
 Summary:   Free UCS Outline Fonts
 Group:     User Interface/X
 # Standard font exception
 License:   GPLv3+ with special font exception
 URL:       http://www.gnu.org/software/freefont/ 
-Source0:   http://savannah.nongnu.org/download/freefont/freefont-sfd-%{version}.tar.gz
-Source1:   gnu-free-fonts-buildscript 
+Source0:   http://savannah.nongnu.org/download/freefont/freefont-src-%{version}.tar.gz
 Source2:   %{fontconf}-mono.conf
 Source3:   %{fontconf}-sans.conf
 Source4:   %{fontconf}-serif.conf
@@ -38,6 +37,7 @@ with which most of the glyphs used in LaTeX can be displayed.
 %package common
 Summary:  Common files for freefont (documentation…)
 Requires: fontpackages-filesystem
+Obsoletes: gnu-free-fonts-compat < 20120503
 
 %description common
 %common_desc
@@ -75,31 +75,17 @@ Requires: %{name}-common = %{version}-%{release}
 This package contains the GNU FreeFont serif font.
 
 
-%package compat
-Summary: GNU freefont compatibility package
-Obsoletes: freefont < 20090104-4
-Requires:  gnu-free-mono-fonts = %{version}-%{release}
-Requires:  gnu-free-sans-fonts = %{version}-%{release}
-Requires:  gnu-free-serif-fonts = %{version}-%{release}
-
-%description compat
-This package only exists to help transition pre 20090104-4 freefont users to \
-the new package split. It will be removed after one distribution release \
-cycle, please do not reference it or depend on it in any way.\
-\
-It can be safely uninstalled.
-
-
 %prep
 %setup -qn freefont-%{version}
 
 
 %build
-fontforge -lang=ff -script %{SOURCE1} *.sfd
+make
 
 %install
 rm -rf %{buildroot}
 
+pushd sfd
 install -m 0755 -d %{buildroot}%{_fontdir}
 install -p -m 644 *.ttf  %{buildroot}%{_fontdir}
 
@@ -123,8 +109,6 @@ for fconf in %{fontconf}-mono.conf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
 
-rm %{buildroot}%{_datadir}/fonts/gnu-free/Untitled1.ttf
-
 %clean
 rm -rf %{buildroot}
 
@@ -134,11 +118,13 @@ rm -rf %{buildroot}
 
 %files common
 %defattr(0644,root,root,0755)
-%doc AUTHORS ChangeLog CREDITS COPYING README Untitled1.ttf
-
-%files compat
+%doc AUTHORS ChangeLog CREDITS COPYING README
 
 %changelog
+* Fri Sep 28 2012 Jon Ciesla <limburgher@gmail.com> 20120503-1
+- New upstream.
+- Dropped compat package.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20100919-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index d51d288..e3309c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-609f40a1d367022302c5e6cc5f4b5fad  freefont-sfd-20100919.tar.gz
+a037c6ea23d7c6ef84e3b6a175141a68  freefont-src-20120503.tar.gz