From 407e0cf74155e244a9644289614a65db87df4e78 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 9 Dec 2004 15:10:52 +0000
Subject: [PATCH] - Remove VFlib2 bits (bug #120498).

---
 ghostscript.spec | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/ghostscript.spec b/ghostscript.spec
index eaaf9ca..e09e66c 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -8,7 +8,7 @@ BuildRequires: patchutils >= 0.2.13
 # Set this to '1' for fontconfig support.
 %define use_fontconfig 0
 
-Release: 35
+Release: 36
 
 License: GPL
 URL: http://www.ghostscript.com/doc/gnu/
@@ -36,8 +36,6 @@ Source11: %{gsj_ver}.tar.gz
 # Source12 is gs6.51 friendly contrib.mak-add for gsj
 Source12: contrib.mak-gsj651.add
 Source13: ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200202.tar.gz
-%define vflib_ver gs704
-Source15: ftp://ftp.u-aizu.ac.jp/pub/tex/ptex-win32/gs/%{vflib_ver}-j-vlib.zip
 Source16: ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz
 Source17: gdevgdi.c
 # http://www.epkowa.co.jp/english/linux_e/dl_laser.html
@@ -49,12 +47,10 @@ Source23: gdevcups.c
 
 Patch0: ghostscript-7.05-config.patch
 Patch3: ghostscript-6.51-gcc296.patch
-Patch5: ghostscript-7.05-gsj.patch
+Patch5: ghostscript-7.07-gsj.patch
 Patch6: ghostscript-7.05-_ds.patch
 Patch7: ghostscript-6.51-gx_device.patch
 Patch8: ghostscript-6.51-gsj_update.patch
-Patch10: ghostscript-7.05-config.kfvflib.patch
-Patch12: ghostscript-7.05-vflib.fixup.patch
 Patch13: ghostscript-6.51-res_path.patch
 Patch14: ghostscript-7.05-ps2epsi.patch
 Patch16: ghostscript-6.51-gdevgdi.patch
@@ -85,10 +81,10 @@ Patch50: ghostscript-pagesize.patch
 Patch51: ghostscript-7.07-fontconfig-rh.patch
 Patch52: ghostscript-7.07-mixedman.patch
 
-Requires: VFlib2, zlib, libpng, glib2
+Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: zlib, zlib-devel, libpng, libpng-devel, unzip, gtk2-devel
-BuildRequires: VFlib2-devel, glib2-devel, XFree86-devel
+BuildRequires: glib2-devel, XFree86-devel
 # Omni requires libxml
 BuildRequires: libxml2-devel
 BuildRequires: cups-devel >= 1.1.13
@@ -165,18 +161,6 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
         cp -f %{SOURCE20} lib/
 
 
-# Add the VFlib/jpdf patch
-# The unix-gcc.mak portions of this patch are in the config patch below
-	mkdir vflib-source
-	unzip %{SOURCE15} -d vflib-source
-	patch vflib-source/gs7.04-j-vlib.diff -b -z .vflib.fixup -i %{PATCH12}
-
-	# Ignore most of the patches to things in lib/ (they are bogus).
-        (filterdiff -p1 -x 'lib/*' vflib-source/gs7.04-j-vlib.diff;
-	 filterdiff -p1 -i 'lib/gs_init.ps' vflib-source/gs7.04-j-vlib.diff) |\
-	patch -p1 -b -V simple -z .vflib
-
-
 # RPM configuration changes to the makefile
 # The config patch sets up the use of a symbol, _XXX_RPM_GS_DEVICES_XXX_ which
 # gets replaced by sed with the contents of the variable GS_DEVS. This
@@ -190,7 +174,6 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
 # 
 %patch0 -p1 -b .config
 # Includes japanese changes
-%patch10 -p1 -b .config.kfvflib
 
 # Turn on every possibly pertinent builtin device
 	GS_DEVS=$GS_DEVS'$(DD)dmprt.dev $(DD)cdj880.dev '
@@ -588,7 +571,6 @@ rm -rf $RPM_BUILD_ROOT
 %config %{_datadir}/ghostscript/%{gs_ver}/lib/gs_init.ps
 %config %{_datadir}/ghostscript/%{gs_ver}/lib/Fontmap*
 %{_datadir}/ghostscript/Resource/
-%{_datadir}/ghostscript/%{gs_ver}/vflib
 %{_datadir}/ghostscript/%{gs_ver}/examples
 %{_mandir}/*/*
 %doc %{_docdir}/%{name}-%{gs_ver}
@@ -614,6 +596,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Dec  9 2004 Tim Waugh <twaugh@redhat.com> 7.07-36
+- Remove VFlib2 bits (bug #120498).
+
 * Fri Dec  3 2004 Tim Waugh <twaugh@redhat.com> 7.07-35
 - Added /etc/ghostscript to search path and to file manifest (bug #98974).