From 1949e8e73a3784f458df095407c54127113a5f7a Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 05:10:59 +0000
Subject: [PATCH] auto-import ghostscript-6.51-12 from
 ghostscript-6.51-12.src.rpm

---
 ghostscript.spec | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/ghostscript.spec b/ghostscript.spec
index 5c72070..6d413fe 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,7 +1,7 @@
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: 6.51
-Release: 11
+Release: 12
 License: GPL
 URL: http://gnu-gs.sourceforge.net/
 Group: Applications/Publishing
@@ -34,12 +34,12 @@ Source16: ftp://ftp.gyve.org/pub/gs-cjk/acro4-cmaps-1999.tar.gz
 Source17: gdevgdi.c
 Source18: http://www.epkowa.on.arena.ne.jp/pips/data/2050/eplaseren-1.0.2-550.tgz
 Source20: ghostscript-6.51-cjk.tar.gz
-# Patch5 is gs6.51 friendly patch for gsj
-Patch5: ghostscript-6.51-gsj.patch
 Patch0: ghostscript-6.51-config.patch
 Patch1: ghostscript-6.51-linuxtime.patch
 Patch2: ghostscript-6.51-mkstemp.patch
 Patch3: ghostscript-6.51-gcc296.patch
+# Patch5 is gs6.51 friendly patch for gsj
+Patch5: ghostscript-6.51-gsj.patch
 Patch6: ghostscript-6.51-_ds.patch
 Patch7: ghostscript-6.51-gx_device.patch
 Patch8: ghostscript-6.51-gsj_update.patch
@@ -50,6 +50,7 @@ Patch14: ghostscript-6.51-ps2epsi.patch
 Patch15: ghostscript-6.51-Omni_glib.patch
 Patch16: ghostscript-6.51-gdevgdi.patch
 Patch17: ghostscript-6.51-Epson_eplaseren.patch
+Patch18: ghostscript-6.51-gs_path.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
@@ -90,7 +91,6 @@ package.
 # Setting linux as a platform that needs <time.h> AND <sys/time.h>
 %patch1 -p1 -b .linuxtime
 
-
 # Patch to use mkstemp for making temp files, for security
 %patch2 -p1 -b .mkstemp
 
@@ -223,10 +223,12 @@ package.
 	GS_DEVS=$GS_DEVS'$(DD)DJ9xxVIP.dev $(DD)AP21xx.dev '
 
         # the following hpijs device got missed in gs6.51
-        cat >>src/contrib.mak <<EOF
-\$(DD)hpijs.dev : \$(hpijs_) \$(DD)page.dev
-	\$(SETPDEV) \$(DD)hpijs \$(hpijs_)
-EOF
+	echo '
+### ----------------------- HP hpijs device ------------------ ###
+$(DD)hpijs.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) $(DD)hpijs $(hpijs_)
+
+' >> src/contrib.mak
 
         # update from hpijs 0.96 to 0.97
 	sed -e 's/DESKJET_MARGINS_LETTER   0.25, 0.44, -0.25, 0.33/DESKJET_MARGINS_LETTER   0.25, 0.44, -0.25, 0.167/' < src/gdevhpij.c > src/gdevhpij.c.tmp
@@ -374,6 +376,9 @@ $(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
 # Patch to make ps2espi better/work
 %patch14 -p1 -b .ps2epsi
 
+# Fix the gs path in lprsetup.sh
+%patch18 -p1 -b .gs_path
+
 # 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
 
@@ -417,6 +422,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Wed Sep  5 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-12
+- fix lprsetup.sh; #50925
+
 * Fri Aug 24 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-11
 - added Epson's old eplaseren drivers,
 - pointed out by Till Kamppeter <till.kamppeter@gmx.net>