Fri Jun 3 16:04:54 UTC 2005

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14991

Modified Files:
	.cvsignore ghostscript.spec sources 
Added Files:
	ghostscript-badc.patch ghostscript-gtk2.patch 
	ghostscript-ps2epsi.patch ghostscript-scripts.patch 
Removed Files:
	Omni-7.05-121002.patch gdevcups-crash.patch gdevcups.c 
	ghostscript-6.51-gcc296.patch ghostscript-6.51-gdevgdi.patch 
	ghostscript-6.51-gs_path.patch 
	ghostscript-6.51-gsj_update.patch 
	ghostscript-6.51-gx_device.patch 
	ghostscript-6.51-ia64_jmp_buf.patch 
	ghostscript-6.51-res_path.patch ghostscript-7.05-73342.patch 
	ghostscript-7.05-_ds.patch 
	ghostscript-7.05-config.kfvflib.patch 
	ghostscript-7.05-config.patch ghostscript-7.05-cups.patch 
	ghostscript-7.05-fPIC.patch ghostscript-7.05-gsj-fixups.patch 
	ghostscript-7.05-gsj.patch 
	ghostscript-7.05-lips4v-fix-pipe.patch 
	ghostscript-7.05-oob-66421.patch ghostscript-7.05-ps1.patch 
	ghostscript-7.05-ps2epsi.patch ghostscript-7.05-scripts.patch 
	ghostscript-7.05-split-CIDFnmap.patch 
	ghostscript-7.05-vflib.fixup.patch ghostscript-7.05-x11.patch 
	ghostscript-7.07-badc.patch 
	ghostscript-7.07-bigposttable.patch 
	ghostscript-7.07-coverage-glyphcount.patch 
	ghostscript-7.07-fontconfig-rh.patch 
	ghostscript-7.07-gcc34.patch ghostscript-7.07-gsj.patch 
	ghostscript-7.07-gsublookuptable.patch 
	ghostscript-7.07-gtk2.patch ghostscript-7.07-mixedman.patch 
	ghostscript-7.07-omni-glib2.patch 
	ghostscript-7.07-ps2epsi.patch ghostscript-badcode.patch 
	ghostscript-bjc250gs.patch ghostscript-gcc4.patch 
	ghostscript-noopt.patch 
Log Message:
* Fri Jun  3 2005 Tim Waugh <twaugh at redhat.com> 8.15-0.rc3.1
- Switch to ESP Ghostscript.
- 8.15.
- Lots of patches dropped.  Perhaps some will need to be re-added.


ghostscript-badc.patch:
 gdevps.c |    2 +-
 scfd.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ghostscript-badc.patch ---
--- espgs-8.15rc3/src/gdevps.c.badc	2005-02-16 21:21:49.000000000 +0000
+++ espgs-8.15rc3/src/gdevps.c	2005-06-03 10:56:31.000000000 +0100
@@ -1164,7 +1164,7 @@
     gs_rect bbox;
 
     gx_device_bbox_bbox(vdev->bbox_device, &bbox);
-    if (pdev->first_page & !vdev->in_page) {
+    if (pdev->first_page && !vdev->in_page) {
 	/* Nothing has been written.  Write the file header now. */
 	code = psw_begin_file(pdev, &bbox);
         if (code < 0)
--- espgs-8.15rc3/src/scfd.c.badc	2005-01-19 04:08:41.000000000 +0000
+++ espgs-8.15rc3/src/scfd.c	2005-06-03 10:56:31.000000000 +0100
@@ -305,7 +305,7 @@
 	 * in the string of initial zeros in the EOL.  If EndOfLine
 	 * is false, we aren't sure what we should do....
 	 */
-	if (ss->EncodedByteAlign & !ss->EndOfLine)
+	if (ss->EncodedByteAlign && !ss->EndOfLine)
 	    ss->bits_left &= ~7;
     }
     /* If we're between scan lines, scan for EOLs. */

ghostscript-gtk2.patch:
 unix-dll.mak |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ghostscript-gtk2.patch ---
--- espgs-8.15rc3/src/unix-dll.mak.gtk2	2005-01-19 04:08:41.000000000 +0000
+++ espgs-8.15rc3/src/unix-dll.mak	2005-06-03 12:31:56.000000000 +0100
@@ -67,7 +67,7 @@
 # Build the small Ghostscript loaders, with Gtk+ and without
 
 $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
-	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
+	$(GLCC) -g `pkg-config gtk+-2.0 --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `pkg-config gtk+-2.0 --libs`
 
 $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
 	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)

ghostscript-ps2epsi.patch:
 ps2epsi |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE ghostscript-ps2epsi.patch ---
--- espgs-8.15rc3/lib/ps2epsi.ps2epsi	2005-06-02 18:13:37.000000000 +0100
+++ espgs-8.15rc3/lib/ps2epsi	2005-06-03 10:47:10.000000000 +0100
@@ -73,6 +73,7 @@
 BEGINEPS
 
 cat "${infile}" |
+LC_ALL=C \
 sed -e '/^%%BeginPreview:/,/^%%EndPreview[^!-\~]*$/d' -e '/^%!PS-Adobe/d' \
     -e '/^%%[A-Za-z][A-Za-z]*[^!-\~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d'
 

ghostscript-scripts.patch:
 ps2epsi |    2 +-
 pv.sh   |   17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

--- NEW FILE ghostscript-scripts.patch ---
--- espgs-8.15rc3/lib/pv.sh.scripts	2005-01-19 04:08:41.000000000 +0000
+++ espgs-8.15rc3/lib/pv.sh	2005-06-02 17:40:08.000000000 +0100
@@ -26,12 +26,17 @@
 # the -D switch from the call of dvips below.
 #
 TEMPDIR=.
-PAGE=$1
+PAGE="$1"
 shift
-FILE=$1
+FILE="$1"
 shift
-trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
-#dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
-dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
-gs $FILE.$$.pv
+TEMPFILE=`mktemp "$TEMPDIR/$FILE.XXXXXX"`
+if [ $? -ne 0 ]
+then
+  exit 1
+fi
+trap 'rm -f "$TEMPFILE"' 0 1 2 15
+#dvips -R -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
+dvips -R -p $PAGE -n 1 "$FILE" "$@" -o "$TEMPFILE"
+gs "$TEMPFILE"
 exit 0
--- espgs-8.15rc3/lib/ps2epsi.scripts	2005-06-02 17:41:32.000000000 +0100
+++ espgs-8.15rc3/lib/ps2epsi	2005-06-02 17:41:50.000000000 +0100
@@ -5,7 +5,7 @@
 	gs=gs
 fi
 
-tmpfile=/tmp/ps2epsi$$
+tmpfile=`mktemp ${TMPDIR-/tmp}/ps2epsi.XXXXXX`
 rm -f $tmpfile
 if test -e $tmpfile; then
 	echo "$0: Our temporary file $tmpfile already exists." 1>&2


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	9 Sep 2004 05:21:34 -0000	1.14
+++ .cvsignore	3 Jun 2005 16:04:52 -0000	1.15
@@ -10,3 +10,4 @@
 lexmarkgs990908.tar.gz
 lxm3200-tweaked-20030501.tar.gz
 pcl3-3.3.tar.gz
+espgs-8.15rc3-source.tar.bz2


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ghostscript.spec	10 Mar 2005 18:06:45 -0000	1.58
+++ ghostscript.spec	3 Jun 2005 16:04:52 -0000	1.59
@@ -1,88 +1,23 @@
-%define gs_ver 7.07
+%define gs_ver 8.15
+%define gs_rc rc3
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 BuildRequires: libjpeg-devel
-BuildRequires: patchutils >= 0.2.13
 
-# Set this to '1' for fontconfig support.
-%define use_fontconfig 0
-
-Release: 40
+Release: 0.%{?gs_rc:%gs_rc.}1
 
 License: GPL
-URL: http://www.ghostscript.com/doc/gnu/
+URL: http://www.cups.org/espgs/
 Group: Applications/Publishing
-Source0: ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs705/%{name}-%{gs_ver}.tar.bz2
-%define pcl3_ver 3.3
-Source2: http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/pcl3-%{pcl3_ver}.tar.gz
-%define md2k_ver 0.2a
-Source3: http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/gdevmd2k-%{md2k_ver}.tar.gz
-Source4: http://lcewww.et.tudelft.nl/~haver/cgi-bin/download/linux/epson740.tgz
-%define lxm_ver tweaked-20030501
-Source6: http://www.linuxprinting.org/download/printing/lxm3200-%{lxm_ver}.tar.gz
-Source7: http://www.powerup.com.au/~pbwest/lexmark/gdevlx50.c
-Source8: ftp://bimbo.fjfi.cvut.cz/users/paluch/lexmarkgs/lexmarkgs990908.tar.gz
-# Url for gs-cjk project, the source of Source9:
-# http://www.gyve.org/gs-cjk/
-%define cjk_ver 6.51-cjk-M2-R3
-Source9: ftp://ftp.gyve.org/pub/gs-cjk/M2/gs%{cjk_ver}.tar.gz
-# The CJK patch is for an older version of ghostscript; some patches don't
-# apply cleanly to the current one. Fixed versions here...
-Source100: lib_gs_cidcm.ps.patch
-Source101: lib_pdf_font.ps.patch
-%define gsj_ver gs550j1
-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
-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
-Source18: eplaser-3.1.4-705.tgz
-Source20: CIDFnmap
-
-# CUPS device (from ESP gs 7.05.4).
-Source23: gdevcups.c
-
-Patch0: ghostscript-7.05-config.patch
-Patch1: ghostscript-badcode.patch
-Patch3: ghostscript-6.51-gcc296.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
-Patch13: ghostscript-6.51-res_path.patch
-Patch14: ghostscript-7.05-ps2epsi.patch
-Patch16: ghostscript-6.51-gdevgdi.patch
-Patch18: ghostscript-6.51-gs_path.patch
-Patch19: ghostscript-6.51-ia64_jmp_buf.patch
-Patch21: Omni-7.05-121002.patch
-Patch24: ghostscript-7.05-scripts.patch
-Patch25: ghostscript-7.05-gsj-fixups.patch
-Patch27: ghostscript-7.05-fPIC.patch
-Patch29: ghostscript-7.05-x11.patch
-Patch30: ghostscript-7.05-ps1.patch
-Patch31: ghostscript-7.05-oob-66421.patch
-Patch33: ghostscript-7.05-73342.patch
-Patch34: ghostscript-7.05-split-CIDFnmap.patch
-Patch35: ghostscript-7.07-ps2epsi.patch
-Patch36: ghostscript-7.07-bigposttable.patch
-Patch37: ghostscript-7.07-gsublookuptable.patch
-Patch38: ghostscript-7.07-coverage-glyphcount.patch
-Patch41: ghostscript-7.05-lips4v-fix-pipe.patch
-Patch42: ghostscript-7.05-cups.patch
-Patch43: ghostscript-7.07-badc.patch
-Patch45: gdevcups-crash.patch
-Patch46: ghostscript-7.07-gcc34.patch
-Patch47: ghostscript-7.07-gtk2.patch
-Patch48: ghostscript-7.07-omni-glib2.patch
-Patch49: ghostscript-bjc250gs.patch
+Source0: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/%{?gs_rc:test/}espgs-%{gs_ver}%{gs_rc}-source.tar.bz2
+
+Patch1: ghostscript-build.patch
+Patch2: ghostscript-gtk2.patch
+Patch24: ghostscript-scripts.patch
+Patch35: ghostscript-ps2epsi.patch
+Patch43: ghostscript-badc.patch
 Patch50: ghostscript-pagesize.patch
-Patch51: ghostscript-7.07-fontconfig-rh.patch
-Patch52: ghostscript-7.07-mixedman.patch
-Patch53: ghostscript-gcc4.patch
-Patch54: ghostscript-noopt.patch
 
 Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
@@ -132,386 +67,37 @@
 A GTK-enabled version of Ghostscript, called 'gsx'.
 
 %prep
-%setup -q
+%setup -q -n espgs-%{gs_ver}%{gs_rc}
 
-# Apply the gs-cjk patches
-	tar xzf %{SOURCE9}
-	(cd gs%{cjk_ver}; cp -f %{SOURCE100} %{SOURCE101} .
-			  rm	src_time_.h.patch \
-				src_unix-gcc.mak.patch \
-				src_gp_unifs.c.patch \
-				lib_gs_res.ps.patch \
-				lib_pdf_ops.ps.patch \
-				src_zfont42.c.patch
-	)
-#	a="0"
-#	for i in gs%{cjk_ver}/*.patch; do
-#		cat $i |patch -p0 -b -V simple -z .cjk$a
-#		a=`expr $a + 1`
-#	done
-
-	# Create a Resource directory
-%patch13 -p1 -b .res_path
-	mkdir Resource
-	mkdir Resource/Font
-	mkdir Resource/CIDFont
-	tar xzf %{SOURCE13} -C Resource
-	tar xzf %{SOURCE16} -C Resource
-
-	tar xzf gs%{cjk_ver}/install-cid.tar.gz -C Resource
-
-	# Replace CJK CIDFnmap files
-        cp -f %{SOURCE20} lib/
-
-
-# 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
-# allows devices to be added to the Makefile by adding them to the
-# GS_DEVS string in this spec file. New devices in this spec file
-# should be added with the line:
-#     GS_DEVS=$GS_DEVS'$(DD)foo.dev ' <-- note the space
-# Those paying attention will wonder why it works this way, the reason is that
-# the DEVICE_DEVS? are NOT treated as real variables by ghostscript's build
-# system, and so we have to actually change the file.
-# 
-%patch0 -p1 -b .config
-# Includes japanese changes
-
-%patch1 -p1 -b .badcode
-
-# Turn on every possibly pertinent builtin device
-	GS_DEVS=$GS_DEVS'$(DD)dmprt.dev $(DD)cdj880.dev '
-	GS_DEVS=$GS_DEVS'$(DD)ap3250.dev $(DD)appledmp.dev $(DD)atx23.dev '
-	GS_DEVS=$GS_DEVS'$(DD)atx24.dev $(DD)atx38.dev $(DD)bmpa16.dev '
-	GS_DEVS=$GS_DEVS'$(DD)bmpa16m.dev $(DD)bmpa256.dev $(DD)bmpa32b.dev '
-	GS_DEVS=$GS_DEVS'$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev '
-	GS_DEVS=$GS_DEVS'$(DD)ccr.dev $(DD)cdj1600.dev $(DD)cdj500.dev '
-	GS_DEVS=$GS_DEVS'$(DD)cdj670.dev $(DD)cdj850.dev '
-	GS_DEVS=$GS_DEVS'$(DD)cdj890.dev $(DD)cfax.dev '
-	GS_DEVS=$GS_DEVS'$(DD)cgm24.dev $(DD)cgm8.dev $(DD)cgmmono.dev '
-	GS_DEVS=$GS_DEVS'$(DD)cljet5pr.dev $(DD)coslw2p.dev $(DD)coslwxl.dev '
-	GS_DEVS=$GS_DEVS'$(DD)cp50.dev $(DD)declj250.dev $(DD)dfaxlow.dev '
-	GS_DEVS=$GS_DEVS'$(DD)dfaxhigh.dev $(DD)djet500c.dev $(DD)dl2100.dev '
-	GS_DEVS=$GS_DEVS'$(DD)dnj650c.dev $(DD)eps9high.dev '
-	GS_DEVS=$GS_DEVS'$(DD)eps9mid.dev $(DD)epson.dev $(DD)epsonc.dev '
-	GS_DEVS=$GS_DEVS'$(DD)escp.dev $(DD)fax.dev $(DD)fs600.dev '
-	GS_DEVS=$GS_DEVS'$(DD)hl1250.dev $(DD)hl7x0.dev $(DD)ibmpro.dev '
-	GS_DEVS=$GS_DEVS'$(DD)imagen.dev $(DD)inferno.dev $(DD)iwhi.dev '
-	GS_DEVS=$GS_DEVS'$(DD)iwlo.dev $(DD)iwlq.dev $(DD)jetp3852.dev '
-	GS_DEVS=$GS_DEVS'$(DD)la50.dev $(DD)la70.dev $(DD)la75.dev '
-	GS_DEVS=$GS_DEVS'$(DD)la75plus.dev $(DD)lbp8.dev $(DD)lj250.dev '
-	GS_DEVS=$GS_DEVS'$(DD)lj3100sw.dev $(DD)lj4dith.dev $(DD)ln03.dev '
-	GS_DEVS=$GS_DEVS'$(DD)lp2563.dev $(DD)lp8000.dev $(DD)lq850.dev '
-	GS_DEVS=$GS_DEVS'$(DD)lxm5700m.dev $(DD)m8510.dev $(DD)mgr4.dev '
-	GS_DEVS=$GS_DEVS'$(DD)mgr8.dev $(DD)mgrgray2.dev $(DD)mgrgray4.dev '
-	GS_DEVS=$GS_DEVS'$(DD)mgrgray8.dev $(DD)mgrmono.dev $(DD)miff24.dev '
-	GS_DEVS=$GS_DEVS'$(DD)necp6.dev $(DD)oce9050.dev '
-	GS_DEVS=$GS_DEVS'$(DD)oki182.dev $(DD)okiibm.dev $(DD)paintjet.dev '
-	GS_DEVS=$GS_DEVS'$(DD)photoex.dev $(DD)pjetxl.dev $(DD)plan9bm.dev '
-	GS_DEVS=$GS_DEVS'$(DD)psdf.dev $(DD)sgirgb.dev $(DD)r4081.dev '
-	GS_DEVS=$GS_DEVS'$(DD)sj48.dev $(DD)st800.dev '
-	GS_DEVS=$GS_DEVS'$(DD)stcolor.dev $(DD)sunhmono.dev $(DD)t4693d2.dev '
-	GS_DEVS=$GS_DEVS'$(DD)t4693d4.dev $(DD)t4693d8.dev $(DD)tek4696.dev '
-	GS_DEVS=$GS_DEVS'$(DD)tfax.dev $(DD)tiffs.dev $(DD)xes.dev '
-	GS_DEVS=$GS_DEVS'$(DD)x11_.dev $(DD)x11alt_.dev $(DD)x11cmyk2.dev '
-	GS_DEVS=$GS_DEVS'$(DD)x11cmyk4.dev $(DD)x11cmyk8.dev $(DD)x11rg16x.dev '
-	GS_DEVS=$GS_DEVS'$(DD)x11rg32x.dev '
-
-
-## Add a monkey-load of Japanese Printers
-	mkdir gsj
-	tar xzf %{SOURCE11} -C gsj
-
-	# Zap the older version of the okidata driver
-	rm gsj/gdevop4w.*
-
-	cp gsj/*.[ch] src/
-	cp gsj/*.{ps,src} lib/
-%patch5 -p1 -b .gsj
-
-	# Repair the gsj code
-%patch7 -p1 -b .gx_device
-%patch8 -p1 -b .gsj_update
-
-	# update the make files
-	GS_DEVS=$GS_DEVS'$(DD)ljet4pjl.dev $(DD)lj4dithp.dev $(DD)dj505j.dev '
-	GS_DEVS=$GS_DEVS'$(DD)picty180.dev $(DD)pr201.dev $(DD)pr150.dev '
-	GS_DEVS=$GS_DEVS'$(DD)pr1000.dev $(DD)pr1000_4.dev $(DD)jj100.dev '
-	GS_DEVS=$GS_DEVS'$(DD)bj10v.dev $(DD)bj10vh.dev $(DD)mag16.dev '
-	GS_DEVS=$GS_DEVS'$(DD)mag256.dev $(DD)mj700v2c.dev $(DD)mj500c.dev '
-	GS_DEVS=$GS_DEVS'$(DD)mj6000c.dev $(DD)mj8000c.dev $(DD)fmpr.dev '
-	GS_DEVS=$GS_DEVS'$(DD)fmlbp.dev $(DD)ml600.dev '
-	GS_DEVS=$GS_DEVS'$(DD)lbp310.dev $(DD)lbp320.dev $(DD)lips2p.dev '
-	GS_DEVS=$GS_DEVS'$(DD)bjc880j.dev $(DD)lips4.dev '
-	GS_DEVS=$GS_DEVS'$(DD)lips4v.dev $(DD)escpage.dev $(DD)lp2000.dev '
-	GS_DEVS=$GS_DEVS'$(DD)npdl.dev $(DD)md50Mono.dev $(DD)md50Eco.dev '
-	GS_DEVS=$GS_DEVS'$(DD)md1xMono.dev '
-	cat %{SOURCE12} >> src/contrib.mak
-
-
-# Turn on IBM's Omni print driver interface
-	GS_DEVS=$GS_DEVS'$(DD)omni.dev '
-	
-	# Apply the 052902 patch.
-%patch21 -p1 -b .Omni.121002
+# Make it build.
+%patch1 -p1 -b .build
+%patch2 -p1 -b .gtk2
 
-	# Fix some shell scripts
+# Fix some shell scripts
 %patch24 -p1 -b .scripts
 
-
-# Turn on HP's hpijs print driver interface
-	GS_DEVS=$GS_DEVS'$(DD)ijs.dev $(DD)DJ630.dev '
-	GS_DEVS=$GS_DEVS'$(DD)DJ6xx.dev $(DD)DJ6xxP.dev $(DD)DJ8xx.dev '
-	GS_DEVS=$GS_DEVS'$(DD)DJ9xx.dev $(DD)DJ9xxVIP.dev $(DD)AP21xx.dev '
-
-# Add pcl3 driver support for some other HP printers
-	tar xzfO %{SOURCE2} pcl3-%{pcl3_ver}/pcl3.tar | tar xf -
-	mv doc/*.1 man
-
-	# update the make files
-	GS_DEVS=$GS_DEVS'$(DD)pcl3.dev '
-	ln -s . pcl3
-	cat src/contrib.mak-6.51.add >> src/contrib.mak
-
-
-# Add support for ALPS printers
-	tar xzf %{SOURCE3}
-	mv gdevmd2k-%{md2k_ver}/*.[ch] src/
-	
-	# update the make files
-	GS_DEVS=$GS_DEVS'$(DD)md2k.dev $(DD)md5k.dev '
-	cat gdevmd2k-%{md2k_ver}/gdevmd2k.mak-5.8x >> src/contrib.mak
-
-
-# Add *.upp files for Epson 740
-	tar xzf %{SOURCE4}
-	mv epson740/*.upp lib/
-
-
-# Add Daniel Gordini's lxm3200 driver
-	tar xzf %{SOURCE6}
-	mv lxm3200-%{lxm_ver}/*.[ch] src/
-
-	# update the make files
-	GS_DEVS=$GS_DEVS'$(DD)lxm3200.dev '
-	echo '
-### ---------------- Lexmark 3200 device ----------------- ###
-lxm3200_=$(GLOBJ)gdevlx32.$(OBJ)
-
-$(GLOBJ)gdevlx32.$(OBJ): $(GLSRC)gdevlx32.c $(PDEVH) $(gsparam_h)
-	$(GLCC) $(GLO_)gdevlx32.$(OBJ) $(C_) $(GLSRC)gdevlx32.c
-
-$(DD)lxm3200.dev: $(lxm3200_) $(DD)page.dev
-	$(SETPDEV) $(DD)lxm3200 $(lxm3200_)
-
-' >> src/contrib.mak
-
-
-# Add the lx5000 driver
-	cp %{SOURCE7} src/
-
-	GS_DEVS=$GS_DEVS'$(DD)lx5000.dev '
-	echo '
-### ----------------- Lexmark 5000 printer ----------------------------- ###
-### Note: this driver was contributed by users.  Please contact:         ###
-###   Peter B. West <pbwest at netscape.net>                                ###
-###   Reported to work with Z51.  May work with 5700 & 7000              ###
-###   Provides colour and black-only, unidirectional 300/600x600dpi.     ###
-
-lx5000_=$(GLOBJ)gdevlx50.$(OBJ)
-
-$(GLOBJ)gdevlx50.$(OBJ) : $(GLSRC)gdevlx50.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevlx50.$(OBJ) $(C_) $(GLSRC)gdevlx50.c
-
-$(DD)lx5000.dev: $(lx5000_) $(DD)page.dev
-	$(SETPDEV) $(DD)lx5000 $(lx5000_)
-
-' >> src/contrib.mak
-
-
-# Add Henryk Paluch's additional lexmark drivers
-	tar xzf %{SOURCE8} 
-	cp lexmarkgs/gdevlx7.c src/
-
-	# update the make files
-	GS_DEVS=$GS_DEVS'$(DD)lex7000.dev $(DD)lex5700.dev '
-	GS_DEVS=$GS_DEVS'$(DD)lex3200.dev $(DD)lex2050.dev '
-echo '
-### ------ Lexmark 2050, 3200, 5700 and 7000 devices ------- ###
-
-lex7000_=$(GLOBJ)gdevlx7.$(OBJ)
-
-$(GLOBJ)gdevlx7.$(OBJ): $(GLSRC)gdevlx7.c $(PDEVH) $(gsparam_h)
-	$(GLCC) $(GLO_)gdevlx7.$(OBJ) $(C_) $(GLSRC)gdevlx7.c
-
-$(DD)lex7000.dev: $(lex7000_) $(DD)page.dev
-	$(SETPDEV) $(DD)lex7000 $(lex7000_)
-
-$(DD)lex5700.dev: $(lex7000_) $(DD)page.dev
-	$(SETPDEV) $(DD)lex5700 $(lex7000_)
-
-$(DD)lex3200.dev: $(lex7000_) $(DD)page.dev
-	$(SETPDEV) $(DD)lex3200 $(lex7000_)
-
-$(DD)lex2050.dev: $(lex7000_) $(DD)page.dev
-	$(SETPDEV) $(DD)lex2050 $(lex7000_)
-
-' >> src/contrib.mak
-
-
-# Add Samsung GDI driver for ML-4500
-	cp %{SOURCE17} src/
-%patch16 -p1 -b .gdevgdi
-
-       # update the make files
-       GS_DEVS=$GS_DEVS'$(DD)gdi.dev '
-echo '
-### ---------------- The Samsung SmartGDI laser printer devices --------- ###
-### Note : this driver is used by Samsung SmartGDI compatible printers.   ###
-###
-
-GDIMONO=$(GLOBJ)gdevgdi.$(OBJ) $(HPPCL)
-
-$(GLOBJ)gdevgdi.$(OBJ): $(GLSRC)gdevgdi.c $(PDEVH) $(gsparam_h)
-	$(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(GLSRC)gdevgdi.c
-
-$(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
-	$(SETPDEV) $(DD)gdi $(GDIMONO)
-
-' >> src/contrib.mak
-
-
-# Add Epson's old eplaseren drivers
-	tar xzf %{SOURCE18} -C src
-
-	GS_DEVS=$GS_DEVS'$(DD)epl5800.dev $(DD)epl2050.dev $(DD)epl2050p.dev '
-	GS_DEVS=$GS_DEVS'$(DD)alc8500.dev $(DD)alc2000.dev $(DD)alc1900.dev '
-	GS_DEVS=$GS_DEVS'$(DD)alc4000.dev $(DD)alc4100.dev $(DD)alc8600.dev '
-	cat src/eplaser-*/*.mak >> src/contrib.mak
-
-	# Repair the gsj code
-%patch6 -p1 -b ._ds
-
-# Add ESP gs CUPS device
-	cp %{SOURCE23} src
-	GS_DEVS=$GS_DEVS'$(DD)cups.dev '
-echo '
-### ----------------- CUPS Ghostscript Driver ---------------------- ###
-
-
-cups_=  $(GLOBJ)gdevcups.$(OBJ)
-
-$(DD)cups.dev:  $(cups_) $(GLD)page.dev
-	$(SETPDEV2) $(DD)cups $(cups_)
-	$(ADDMOD) $(DD)cups -lib cupsimage -lib cups
-
-$(GLOBJ)gdevcups.$(OBJ): $(GLSRC)gdevcups.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevcups.$(OBJ) $(C_) $(GLSRC)gdevcups.c
-
-' >> src/contrib.mak
-
-# Patch to make gcc296 happier
-%patch3 -p1 -b .gcc296
-
-# Patch to make ps2espi better/work
-%patch14 -p1 -b .ps2epsi
-
-# Fix the gs path in lprsetup.sh
-%patch18 -p1 -b .gs_path
-
-# Stupid ia64 jmp_buf alignment patch
-%patch19 -p1 -b .ia64_jmp_buf
-
-# Fix-up gdevdmpr.c
-%patch25 -p1 -b .gsj-fixups
-
-# Fix compilation with newer binutils
-%patch27 -p1 -b .fPIC
-
-# Fix XLIBDIR
-%patch29 -p1 -b .x11
-
-# Fix level 1 PostScript output (bug #78450).
-%patch30 -p1 -b .ps1
-
-%patch31 -p1 -b .oob
-
-# Add some missing font aliases (bug #73342).
-%patch33 -p1 -b .73342
-
-# CIDFnmap files are split out to ttfonts-* packages (bug #83516).
-%patch34 -p1 -b .split-CIDFnmap
-
 # Fix sed usage in ps2epsi (bug #89300).
 %patch35 -p1 -b .ps2epsi
 
-# Fix bug #100557.
-%patch36 -p1 -b .bigposttable
-
-# Fix bug #100685.
-%patch37 -p1 -b .gsublookuptable
-%patch38 -p1 -b .coverage-glyphcount
-
-%patch41 -p1 -b .lips4v-fix-pipe
-
-# Apply patch from CUPS for media attrs
-%patch42 -p1 -b .cups
-
 %patch43 -p1 -b .badc
 
-%patch45 -p1 -b .gdevcups-crash
-%patch46 -p1 -b .gcc34
-%patch47 -p1 -b .gtk2
-%patch48 -p1 -b .omni-glib2
-
-# Add bjc250gs driver
-%patch49 -p1 -b .bjc250gs
-	GS_DEVS=$GS_DEVS'$(DD)bjcmono.dev $(DD)bjcgray.dev '
-	GS_DEVS=$GS_DEVS'$(DD)bjccmyk.dev $(DD)bjccolor.dev '
-
 # Prevent pdf2ps generating "null setpagesize" (bug #126446).
 %patch50 -p1 -b .pagesize
 
-# Add fontconfig support (bug #111412).
-%if %{use_fontconfig}
-%patch51 -p1 -b .fontconfig-rh
-%endif
-
-# 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
-
-# Link with gimp-print
-cat << EOF >> Makefile
-
-STPLIB=gimpprint
-EOF
-
-# Turn on IJS support
-cat << EOF >> Makefile
-
-IJSDIR=ijs
-IJSDEVS='\$(DD)ijs.dev'
-IJSEXECTYPE=unix
-EOF
-
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
 	mv "${1}_" "$1"
 }
-from8859_1 man/gs-pcl3.1
-from8859_1 man/pcl3opts.1
-%patch52 -p1
-%patch53 -p1 -b .gcc4
-%patch54 -p1 -b .noopt
 for i in man/de/*.1; do from8859_1 "$i"; done
 
 %build
+%configure --with-ijs
+
 # Build IJS
 cd ijs
-autoconf # The shipped configure script is broken and needs remaking.
-%configure
+automake --add-missing --copy || : # Ships with broken symlinks
+%configure --enable-shared --enable-static
 make
 cd ..
 
@@ -530,7 +116,13 @@
 	datadir=$RPM_BUILD_ROOT%{_datadir} \
 	bindir=$RPM_BUILD_ROOT%{_bindir} \
 	libdir=$RPM_BUILD_ROOT%{_libdir} \
-	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_ver}
+	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_ver} \
+	gsdir=$RPM_BUILD_ROOT%{_datadir}/%{name} \
+	gsdatadir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver} \
+	CUPSSERVER=$RPM_BUILD_ROOT`cups-config --serverbin` \
+	CUPSCONFIG=$RPM_BUILD_ROOT`cups-config --serverroot` \
+	CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir`
+
 mv -f $RPM_BUILD_ROOT%{_bindir}/gsc $RPM_BUILD_ROOT%{_bindir}/gs
 
 cd ijs
@@ -552,8 +144,15 @@
 install -m0644 src/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 install -m0644 src/gdevdsp.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 
-# Don't ship ijs_client_example.
-rm -f $RPM_BUILD_ROOT%{_bindir}/ijs_client_example
+# Don't ship ijs example client or server
+rm -f $RPM_BUILD_ROOT%{_bindir}/ijs_{client,server}_example
+
+# Don't ship files that get shipped in the cups package.
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/cups
+rm -f $RPM_BUILD_ROOT%{_libdir}/cups/filter/pstoraster
+
+# Don't ship two copies of Resource.  Just the unversioned one will do.
+rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/%{gs_ver}/Resource
 
 mkdir -p $RPM_BUILD_ROOT/etc/ghostscript
 
@@ -584,7 +183,9 @@
 %doc %{_docdir}/%{name}-%{gs_ver}
 %{_libdir}/libgs.so.*
 %{_libdir}/libgs.so
-%{_libdir}/libijs.so*
+%{_libdir}/libijs*.so*
+%{_libdir}/cups/filter/pstopxl
+%{_datadir}/cups/model/pxl*
 
 %files gtk
 %defattr(-,root,root)
@@ -597,13 +198,19 @@
 %dir %{_includedir}/ijs
 %{_includedir}/ijs/*
 %{_bindir}/ijs-config
-%{_libdir}/libijs.a
+%{_libdir}/libijs.*a
+%{_libdir}/pkgconfig/ijs.pc
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Jun  3 2005 Tim Waugh <twaugh at redhat.com> 8.15-0.rc3.1
+- Switch to ESP Ghostscript.
+- 8.15.
+- Lots of patches dropped.  Perhaps some will need to be re-added.
+
 * Thu Mar 10 2005 Tim Waugh <twaugh at redhat.com> 7.07-40
 - Build igcref.c with -O0 to work around bug #150771.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	9 Sep 2004 05:21:34 -0000	1.18
+++ sources	3 Jun 2005 16:04:52 -0000	1.19
@@ -1,12 +1 @@
-2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
-e8fbffadb8d70ce5f92708a699ae7765  adobe-cmaps-200202.tar.gz
-94246b034af171b4336d90198e9f4bd8  eplaser-3.1.4-705.tgz
-2c6ebfe51cab34ee61e3dd524c8640cc  epson740.tgz
-5ed2b4218b8f77cb411f3d2e4509ed24  gdevmd2k-0.2a.tar.gz
-85fd16cdc8232e5e3679a3a7e30a3359  ghostscript-7.07.tar.bz2
-d202cd105c496b7f0eb5221316fb7b7f  gs550j1.tar.gz
-6f8e90effe12527a4c3b36ea4ce47b3c  gs6.51-cjk-M2-R3.tar.gz
-b32da7d61421384a0874037576033861  gs704-j-vlib.zip
-aea08da4e37ab68ed6f1dc451f24b30b  lexmarkgs990908.tar.gz
-0f88082030c6eb66a95804a6cc9b9e6b  lxm3200-tweaked-20030501.tar.gz
-34e664c2a98b847598f8441f8cac7ab6  pcl3-3.3.tar.gz
+e6fb2e581bd2b85368f7664be8d38186  espgs-8.15rc3-source.tar.bz2


--- Omni-7.05-121002.patch DELETED ---


--- gdevcups-crash.patch DELETED ---


--- gdevcups.c DELETED ---


--- ghostscript-6.51-gcc296.patch DELETED ---


--- ghostscript-6.51-gdevgdi.patch DELETED ---


--- ghostscript-6.51-gs_path.patch DELETED ---


--- ghostscript-6.51-gsj_update.patch DELETED ---


--- ghostscript-6.51-gx_device.patch DELETED ---


--- ghostscript-6.51-ia64_jmp_buf.patch DELETED ---


--- ghostscript-6.51-res_path.patch DELETED ---


--- ghostscript-7.05-73342.patch DELETED ---


--- ghostscript-7.05-_ds.patch DELETED ---


--- ghostscript-7.05-config.kfvflib.patch DELETED ---


--- ghostscript-7.05-config.patch DELETED ---


--- ghostscript-7.05-cups.patch DELETED ---


--- ghostscript-7.05-fPIC.patch DELETED ---


--- ghostscript-7.05-gsj-fixups.patch DELETED ---


--- ghostscript-7.05-gsj.patch DELETED ---


--- ghostscript-7.05-lips4v-fix-pipe.patch DELETED ---


--- ghostscript-7.05-oob-66421.patch DELETED ---


--- ghostscript-7.05-ps1.patch DELETED ---


--- ghostscript-7.05-ps2epsi.patch DELETED ---


--- ghostscript-7.05-scripts.patch DELETED ---


--- ghostscript-7.05-split-CIDFnmap.patch DELETED ---


--- ghostscript-7.05-vflib.fixup.patch DELETED ---


--- ghostscript-7.05-x11.patch DELETED ---


--- ghostscript-7.07-badc.patch DELETED ---


--- ghostscript-7.07-bigposttable.patch DELETED ---


--- ghostscript-7.07-coverage-glyphcount.patch DELETED ---


--- ghostscript-7.07-fontconfig-rh.patch DELETED ---


--- ghostscript-7.07-gcc34.patch DELETED ---


--- ghostscript-7.07-gsj.patch DELETED ---


--- ghostscript-7.07-gsublookuptable.patch DELETED ---


--- ghostscript-7.07-gtk2.patch DELETED ---


--- ghostscript-7.07-mixedman.patch DELETED ---


--- ghostscript-7.07-omni-glib2.patch DELETED ---


--- ghostscript-7.07-ps2epsi.patch DELETED ---


--- ghostscript-badcode.patch DELETED ---


--- ghostscript-bjc250gs.patch DELETED ---


--- ghostscript-gcc4.patch DELETED ---


--- ghostscript-noopt.patch DELETED ---


