From 2b5d24d3b2fab618964ddd103da2a02707db96f7 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 05:10:09 +0000
Subject: auto-import ghostscript-6.51-9 from ghostscript-6.51-9.src.rpm


---

diff --git a/ghostscript.spec b/ghostscript.spec
index 65c589e..09c3913 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,7 +1,7 @@
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: 6.51
-Release: 6
+Release: 9
 License: GPL
 URL: http://gnu-gs.sourceforge.net/
 Group: Applications/Publishing
@@ -45,17 +45,18 @@ Patch10: ghostscript-6.51-config.kfvflib.patch
 Patch12: ghostscript-6.51-vflib.fixup.patch
 Patch13: ghostscript-6.51-res_path.patch
 Patch14: ghostscript-6.51-ps2epsi.patch
+Patch15: ghostscript-6.51-Omni_glib.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
 # included.	-Crutcher
 Patch11: gs5.50-rth.patch
 
+# xtt-fonts -> ttfonts-ja
+Requires: VFlib2, ttfonts-ja, zlib, libpng, glib
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: zlib, zlib-devel, libpng, libpng-devel
-BuildRequires: VFlib2-devel
-# xtt-fonts -> ttfonts-ja
-Requires: VFlib2, ttfonts-ja, zlib, libpng
+BuildRequires: VFlib2-devel, glib-devel
 BuildPreReq: freetype-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -77,7 +78,6 @@ package.
 %prep
 %setup -q
 
-
 # Set up the jpeg library
 	tar xzf %{SOURCE1}
 	ln -s jpeg-%{jpeg_ver} jpeg
@@ -208,12 +208,25 @@ package.
 # Turn on IBM's Omni print driver interface
 	GS_DEVS=$GS_DEVS'$(DD)omni.dev '
 	
+	# Repair Omni for glib changes
+	# (this patch must come after the vflib patch)
+%patch15 -p2 -b .Omni_glib
+
 
 # Turn on HP's hpijs print driver interface
-	GS_DEVS=$GS_DEVS'$(DD)DJ630.dev $(DD)DJ6xx.dev $(DD)DJ6xxP.dev '
-	GS_DEVS=$GS_DEVS'$(DD)DJ8xx.dev $(DD)DJ9xx.dev $(DD)DJ9xxVIP.dev '
-	GS_DEVS=$GS_DEVS'$(DD)AP21xx.dev '
+	GS_DEVS=$GS_DEVS'$(DD)hpijs.dev $(DD)DJ630.dev $(DD)DJ6xx.dev '
+	GS_DEVS=$GS_DEVS'$(DD)DJ6xxP.dev $(DD)DJ8xx.dev $(DD)DJ9xx.dev '
+	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
+
+        # 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
+	mv src/gdevhpij.c.tmp src/gdevhpij.c
 
 # Add hpdj driver support for some other HP printers
 	mkdir hpdj
@@ -369,6 +382,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Sun Aug 19 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-9
+- applied IBM's glib patches for Omni, which now works.
+- BE AWARE: we now link against libstdc++ and glib for this, and use a c++
+- link stage to do the dirty.
+- added glib-devel buildreq and glib req, I don't think we require everything
+- yet, I could pull in sasl.
+
+* Sun Aug 19 2001 David Suffield <david_suffield@hp.com> 6.51-8
+- Added gs device hpijs and updated gdevhpij.c to hpijs 0.97
+
+* Wed Aug 15 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-7
+- pull in ynakai's update to the cjk resources.
+
 * Thu Aug  9 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-6
 - turn dmprt and cdj880 back on. for some reason, they work now.
 - voodoo, who knows.
@@ -398,8 +424,8 @@ rm -rf $RPM_BUILD_ROOT
 - turned on HP's hpijs print drivers interface
 - turned on every driver that looked usable from linux
 - sacrificed a chicken to integrate the old Japanese drivers
-	This didn't work. The japanese patches are turned off, pending review.
-	I can do loops with C, but the bugs are in Postscript init files
+- - This didn't work. The japanese patches are turned off, pending review.
+- - I can do loops with C, but the bugs are in Postscript init files
 
 * Wed Apr 11 2001 Crutcher Dunnavant <crutcher@redhat.com>
 - added P. B. West's lx5000 driver
diff --git a/sources b/sources
index 4ef6d03..bddf110 100644
--- a/sources
+++ b/sources
@@ -2,7 +2,7 @@
 3ff23ba3f0b820fdb47eb925af35f798  adobe-cmaps-200103.tar.gz
 2c6ebfe51cab34ee61e3dd524c8640cc  epson740.tgz
 5ed2b4218b8f77cb411f3d2e4509ed24  gdevmd2k-0.2a.tar.gz
-f04509c73ddc247e6b94e7dc1835d143  ghostscript-6.51-cjk.tar.gz
+ce48f1be1c9a0b8e468b258bc61a98db  ghostscript-6.51-cjk.tar.gz
 6b6d2123daaa1d217aadcbba7f2d6179  ghostscript-6.51.tar.bz2
 d202cd105c496b7f0eb5221316fb7b7f  gs550j1.tar.gz
 78d6761aab82e70f9c7ee3a1afd72aba  gs6.51-cjk-M2-R1.tar.gz