From 1e1d6a8c16b7b34deb53001f44e90507bd27ebb0 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Mar 25 2011 17:43:47 +0000
Subject: Removed non-free fonts (bug #690593).


---

diff --git a/.gitignore b/.gitignore
index 831e5d7..7e4e10b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gnu-gs-fonts-other-5.50.tar.gz
+/gnu-gs-fonts-other-5.50-nobch.tar.gz
diff --git a/generate-tarball.sh b/generate-tarball.sh
new file mode 100755
index 0000000..067cde2
--- /dev/null
+++ b/generate-tarball.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+NAME=gnu-gs-fonts-other
+DIR=fonts
+VERSION=$1
+rm -rf "$DIR"
+tar zxf "$NAME"-"$VERSION".tar.gz
+for file in					\
+	bchb.afm				\
+	bchb.pfa				\
+	bchbi.afm				\
+	bchbi.pfa				\
+	bchr.afm				\
+	bchr.pfa				\
+	bchri.afm				\
+	bchri.pfa
+do
+	rm "$DIR"/"$file"
+done
+tar zcf "$NAME"-"$VERSION"-nobch.tar.gz "$DIR"
+rm -rf "$DIR"
diff --git a/ghostscript-fonts.spec b/ghostscript-fonts.spec
index 691ddf7..e19bb74 100644
--- a/ghostscript-fonts.spec
+++ b/ghostscript-fonts.spec
@@ -1,7 +1,7 @@
 Summary: Fonts for the Ghostscript PostScript interpreter
 Name: ghostscript-fonts
 Version: 5.50
-Release: 24%{?dist}
+Release: 25%{?dist}
 # Contacted Kevin Hartig, who agreed to relicense his fonts under the SIL Open Font 
 # License. Hershey fonts are under the "Hershey Font License", which is not what Fontmap 
 # says (Fontmap is wrong).
@@ -9,9 +9,16 @@ License: GPLv2+ and Hershey and MIT and OFL and Public Domain
 Group: Applications/Publishing
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnu.org/software/ghostscript/
-Source0: http://ftp.gnu.org/gnu/ghostscript/gnu-gs-fonts-other-%{version}.tar.gz
+Source0: gnu-gs-fonts-other-%{version}-nobch.tar.gz
 Source1: Kevin_Hartig-Font_License.txt
 Source2: SIL-Open-Font-License.txt
+# gnu-gs-fonts-other-5.50 contains fonts with a non-free license (bug #690593).
+# Therefore we use this script to remove those fonts before shipping
+# it.  Download the upstream tarball (from
+# http://ftp.gnu.org/gnu/ghostcript/gnu/) and invoke this script while in
+# the tarball's directory:
+# ./generate-tarball.sh 5.50
+Source3: generate-tarball.sh
 Requires: fontconfig
 Requires(post): xorg-x11-font-utils
 Requires(post): fontconfig
@@ -65,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{catalogue}/default-ghostscript
 
 %changelog
+* Fri Mar 25 2011 Tim Waugh <twaugh@redhat.com> 5.50-25
+- Removed non-free fonts (bug #690593).
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.50-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 8d8c7d4..295cbf0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33457d3f37de7ef03d2eea05a9e6aa4f  gnu-gs-fonts-other-5.50.tar.gz
+5df81ad4aa35967cfe1c4f5cd954a629  gnu-gs-fonts-other-5.50-nobch.tar.gz