From bb588fef61e245e152a585b2662c342e8f869735 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 05:17:04 +0000
Subject: [PATCH] auto-import ghostscript-7.05-25 from
 ghostscript-7.05-25.src.rpm

---
 .cvsignore       |  2 +-
 ghostscript.spec | 49 +++++++++++++++++++++++++++++++++---------------
 sources          |  2 +-
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 84d6506..3e33837 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,7 +9,7 @@ gnu-drivers.tar.gz
 gs550j1.tar.gz
 gs6.51-cjk-M2-R3.tar.gz
 gs704-j-vlib.zip
-hpijs-1.1.tar.gz
+hpijs-1.3.tar.gz
 jpegsrc.v6b.tar.gz
 lexmarkgs990908.tar.gz
 lxm3200-0.4.1-gs5.50-src.tar.gz
diff --git a/ghostscript.spec b/ghostscript.spec
index bab4ac9..d262df3 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -5,8 +5,8 @@ Version: %{gs_ver}
 BuildRequires: gimp-print-devel
 BuildRequires: patchutils >= 0.2.13
 
-Release: 20.1
-%define hpijs 1.1
+Release: 25
+%define hpijs 1.3
 %define hpijs_release %{release}
 
 
@@ -50,9 +50,6 @@ Source20: CIDFnmap-cjk-20020627.tar.gz
 # Some drivers mistakenly got left out of 7.05.
 Source21: gnu-drivers.tar.gz
 
-# New gomni.c from IBM (bug #65269).
-Source22: gomni.c
-
 # CUPS device (from ESP gs 7.05.4).
 Source23: gdevcups.c
 
@@ -70,13 +67,15 @@ Patch16: ghostscript-6.51-gdevgdi.patch
 Patch17: ghostscript-6.51-Epson_eplaseren.patch
 Patch18: ghostscript-6.51-gs_path.patch
 Patch19: ghostscript-6.51-ia64_jmp_buf.patch
-Patch21: Omni-7.05-052902-patch.clean
+Patch21: Omni-7.05-071902.patch
 Patch24: ghostscript-7.05-scripts.patch
 Patch25: ghostscript-7.05-gsj-fixups.patch
 Patch26: ghostscript-7.05-dx6.patch
 Patch27: ghostscript-7.05-fPIC.patch
 Patch28: ghostscript-7.05-gb18030.patch
-Patch29: ghostscript-7.05-zfile.patch
+Patch29: hpijs-1.3-rss.1.patch
+Patch30: ghostscript-7.05-x11.patch
+Patch31: ghostscript-7.05-ps1.patch
 
 # I dont think this patch is needed anymore, so it is not applied.
 # but I might be wrong, and dont really understand it, so it is still
@@ -276,10 +275,7 @@ PhotoSmart, DeskJet 990C and PhotoSmart 100 series.
 	GS_DEVS=$GS_DEVS'$(DD)omni.dev '
 	
 	# Apply the 052902 patch.
-%patch21 -p0 -b .Omni.052902
-
-	# Fix bug #65269.
-cp %{SOURCE22} src/gomni.c
+%patch21 -p0 -b .Omni.071902
 
 	# Fix some shell scripts
 %patch24 -p1 -b .scripts
@@ -465,8 +461,16 @@ $(GLOBJ)gdevcups.$(OBJ): $(GLSRC)gdevcups.c $(PDEVH)
 # Add CIDnmap for GB18030 font (bug #71135)
 %patch28 -p1 -b .gb18030
 
-# Added zfile.c security fixes from 7.07.
-%patch29 -p1 -b .zfile
+# Patch hpijs with Richard Spencer-Smith's enhancements.
+cd hpijs-%{hpijs}
+%patch29 -p1 -b .rss
+cd ..
+
+# Fix XLIBDIR
+%patch30 -p1 -b .x11
+
+# Fix level 1 PostScript output (bug #78450).
+%patch31 -p1 -b .ps1
 
 # Set up for a unix os, gcc compiler build, and replace our insertion string
 sed -e "s/_XXX_RPM_GS_DEVICES_XXX_/$GS_DEVS/;" src/unix-gcc.mak > Makefile
@@ -511,6 +515,7 @@ make install soinstall	prefix=$RPM_BUILD_ROOT%{_prefix} \
 			mandir=$RPM_BUILD_ROOT%{_mandir} \
 			datadir=$RPM_BUILD_ROOT%{_datadir} \
 			bindir=$RPM_BUILD_ROOT%{_bindir} \
+			libdir=$RPM_BUILD_ROOT%{_libdir} \
 			docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_ver}
 cd hpijs-%{hpijs}
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -585,8 +590,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libijs.a
 
 %changelog
-* Sun May 18 2003 Tim Waugh <twaugh@redhat.com> 7.05-20.1
-- Added zfile.c security fixes from 7.07.
+* Tue Nov 26 2002 Tim Waugh <twaugh@redhat.com> 7.05-25
+- Fix level 1 PostScript output (bug #78450).
+- No need to carry gomni.c, since it comes from the patch.
+
+* Mon Nov 11 2002 Tim Waugh <twaugh@redhat.com> 7.05-24
+- Omni 071902 patch.
+
+* Mon Nov 11 2002 Tim Waugh <twaugh@redhat.com> 7.05-23
+- hpijs-1.3, with updated rss patch.
+- Fix XLIBDIRS.
+
+* Fri Oct 25 2002 Tim Waugh <twaugh@redhat.com> 7.05-22
+- hpijs-rss 1.2.2.
+
+* Mon Oct 14 2002 Tim Waugh <twaugh@redhat.com> 7.05-21
+- Set libdir when installing.
 
 * Thu Aug 15 2002 Tim Waugh <twaugh@redhat.com> 7.05-20
 - Add cups device (bug #69573).
diff --git a/sources b/sources
index 7a5499d..d89be69 100644
--- a/sources
+++ b/sources
@@ -9,7 +9,7 @@ e8fbffadb8d70ce5f92708a699ae7765  adobe-cmaps-200202.tar.gz
 d202cd105c496b7f0eb5221316fb7b7f  gs550j1.tar.gz
 6f8e90effe12527a4c3b36ea4ce47b3c  gs6.51-cjk-M2-R3.tar.gz
 b32da7d61421384a0874037576033861  gs704-j-vlib.zip
-be2ae5eb4e80a4cdce56a11fbde655fc  hpijs-1.1.tar.gz
+9d0b79d0fae39f3efc5b8db60f51a8fa  hpijs-1.3.tar.gz
 dbd5f3b47ed13132f04c685d608a7547  jpegsrc.v6b.tar.gz
 aea08da4e37ab68ed6f1dc451f24b30b  lexmarkgs990908.tar.gz
 ec11b9ef72ecaabb61eeba27e93f9f2b  lxm3200-0.4.1-gs5.50-src.tar.gz