diff --git a/.cvsignore b/.cvsignore
index 15246b0..271ae75 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,11 +1,14 @@
+acro4-cmaps-1999.tar.gz
+adobe-cmaps-200103.tar.gz
 epson740.tgz
 gdevmd2k-0.2a.tar.gz
-ghostscript-5.50gnu.tar.gz
-gnu-gs-5.50.tar.gz
-gnu-gs-5.50jpeg.tar.gz
-gs5.50-vflib-1.0.tar.gz
+ghostscript-6.51-cjk.tar.gz
+ghostscript-6.51.tar.bz2
 gs550j1.tar.gz
-hp8xxs13.zip
+gs6.51-cjk-M2-R1.tar.gz
+gs650-j-vlib.zip
 hpdj-2.6.tar.gz
+jpegsrc.v6b.tar.gz
+lexmarkgs990908.tar.gz
 lxm3200-0.4.1-gs5.50-src.tar.gz
-print-4.0a3.tar.gz
+print-4.0.5.tar.gz
diff --git a/ghostscript.spec b/ghostscript.spec
index 28ff906..f06d75b 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,209 +1,404 @@
-%define enable_japanese 1
-%define vflib gs5.50-vflib-1.0
-%define gsj gs550j1
-
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
-%define hpdjver 2.6
-%define md2kver 0.2a
-Version: 5.50
-Release: 19.rh7.1
+Version: 6.51
+Release: 5
 License: GPL
 URL: http://gnu-gs.sourceforge.net/
 Group: Applications/Publishing
-Source0: ftp://ftp.cs.wisc.edu/pub/ghost/gnu/gs550/gnu-gs-%{version}.tar.gz
-Source1: ftp://ftp.cs.wisc.edu/pub/ghost/gnu/gs550/gnu-gs-%{version}jpeg.tar.gz
-Source2: http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/hp8xxs13.zip
-Source3: ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/hpdj-%{hpdjver}.tar.gz
-Source4: ftp://ftp.cs.wisc.edu/pub/ghost/aladdin/gs550/ghostscript-%{version}gnu.tar.gz
-Source5: http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/gdevmd2k-%{md2kver}.tar.gz
-Source6: http://lcewww.et.tudelft.nl/~haver/cgi-bin/download/linux/epson740.tgz
-Source10: http://www.ldl.jaist.ac.jp/~akr/nonresearch/free-software/ghostscript/%{vflib}.tar.gz
-Source11: %{gsj}.tar.gz
-Source12: http://download.sourceforge.net/gimp-print/print-4.0a3.tar.gz
-Source13: http://www.geocities.com/dgordini/lxm3200-0.4.1-gs5.50-src.tar.gz
-Patch0: ghostscript-5.50-config.patch
-Patch1: gs5.50-rth.patch
-Patch3: gs5.50-hp8xx.patch
-Patch4: gs5.50-hpdj.patch
-# Location of files used to generate patch 5:
-# http://www.ultranet.com/~setaylor/papers.htm
-Patch5: gs5.50-lexmark5700.patch
-# Location of files used to generate patch 6:
-# http://bimbo.fjfi.cvut.cz/~paluch/l7kdriver/
-Patch6: gs5.50-lexmark7000.patch
-# Same as Patch0, but patched against vflib changes
-Patch10: ghostscript-5.50-configj.patch
-Patch11: ghostscript-5.50-cdj880.patch
-Patch12: ghostscript-5.50-bmp16m.patch
-Patch13: ghostscript-5.50-gcc296.patch
-Patch14: ghostscript-5.50-bug19212.patch
-Patch15: ghostscript-5.50-mkstemp-LD_RUN_PATH.patch
-Patch16: gs5.50-time.patch
-Patch17: ghostscript-5.50-PARANOIDSAFER.patch
-%if %{enable_japanese}
-Patch20: ghostscript-5.50-jisb.patch
-%endif
-Patch21: ghostscript-5.50-ps.patch
+Source0: ftp://ftp.cs.wisc.edu/pub/ghost/gnu/gs651/%{name}-%{version}.tar.bz2
+%define jpeg_ver 6b
+Source1: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{jpeg_ver}.tar.gz 
+%define hpdj_ver 2.6
+Source2: ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/hpdj-%{hpdj_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 gimp_ver 4.0.5
+Source5: http://prdownloads.sourceforge.net/gimp-print/print-%{gimp_ver}.tar.gz
+%define lxm_ver 0.4.1-gs5.50
+Source6: http://www.geocities.com/dgordini/lxm3200-%{lxm_ver}-src.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-R1
+Source9: ftp://ftp.gyve.org/pub/gs-cjk/M2/gs%{cjk_ver}.tar.gz
+%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-200103.tar.gz
+%define vflib_ver gs650
+Source15: ftp://ftp.u-aizu.ac.jp/pub/tex/ptex-win32/WEB2C7.3/%{vflib_ver}-j-vlib.zip
+Source16: ftp://ftp.gyve.org/pub/gs-cjk/acro4-cmaps-1999.tar.gz
+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
+Patch6: ghostscript-6.51-_ds.patch
+Patch7: ghostscript-6.51-gx_device.patch
+Patch8: ghostscript-6.51-gsj_update.patch
+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
+ 
+# 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
+
 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
 BuildPreReq: freetype-devel
-%if %{enable_japanese}
-BuildPreReq: VFlib2-devel
-Requires: VFlib2
-Requires: xtt-fonts
-%endif
-BuildRoot: /var/tmp/ghostscript-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
 Ghostscript is a set of software that provides a PostScript(TM)
 interpreter, a set of C procedures (the Ghostscript library, which
 implements the graphics capabilities in the PostScript language) and
-an interpreter for Portable Document Format (PDF) files.  Ghostscript
+an interpreter for Portable Document Format (PDF) files. Ghostscript
 translates PostScript code into many common, bitmapped formats, like
-those understood by your printer or screen.  Ghostscript is normally
+those understood by your printer or screen. Ghostscript is normally
 used to display PostScript files and to print PostScript files to
 non-PostScript printers.
 
 If you need to display PostScript files or print them to
-non-PostScript printers, you should install ghostscript.  If you
+non-PostScript printers, you should install ghostscript. If you
 install ghostscript, you also need to install the ghostscript-fonts
 package.
 
 %prep
-%setup -q -n gs%{version}
-%setup -q -T -D -a 1 -a 5 -b 4 -a 10 -a 11 -n gs%{version}
-ln -s jpeg-6b jpeg
-%if %{enable_japanese}
-patch -s -p1 < %{vflib}/%{vflib}.diff
-%patch10 -p1 -b .config
-patch -s -p1 -b --suffix .gsj < %{gsj}.diff
-cat jdevs.add >>contrib.mak
-%else
-%patch0 -p1 -b .config
-%endif
-%patch1 -p1 -b .rth
-# Add support for HP 8xx printers
-%patch3 -p1 -b .hp8xx
-mkdir tmp
-cd tmp
-unzip -a -L %{SOURCE2}
-mv *.c *.h ..
-rm -f *
-# Add upp files for epson 740
-tar xzvf %{SOURCE6}
-mv epson740/*.upp ..
-# Add support for some other HP printers
-tar xzfO %{SOURCE3} hpdj-%{hpdjver}/hpdj.tar | tar xf -
-mv *.c *.h *.1 ..
-cd ..
-%patch11 -p1 -b .cdj880
-cat tmp/contrib.mak-%{version}.add >>contrib.mak
+%setup -q
+
+
+# Set up the jpeg library
+	tar xzf %{SOURCE1}
+	ln -s jpeg-%{jpeg_ver} jpeg
+
+
+# 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
+
+# Apply the gs-cjk patches
+	tar xzf %{SOURCE9}
+	(cd gs%{cjk_ver}; rm	src_time_.h.patch \
+				src_unix-gcc.mak.patch \
+				src_gp_unifs.c.patch 
+	)
+	cat gs%{cjk_ver}/*.patch | patch -p0 -b -V simple -z .cjk
+
+	# 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
+        tar xzf %{SOURCE20} -C Resource/CIDFont
+
+
+# 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
+%patch12 -p1 -b .vflib.fixup
+
+	patch -p1 -b -V simple -z .vflib < vflib-source/%{vflib_ver}-j-vlib.diff
+
+
+# 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
+%patch10 -p1 -b .config.kfvflib
+
+# Turn on every possibly pertinent builtin device
+	#? dmprt.dev 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)cdj970.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
+%patch6 -p1 -b ._ds
+%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 '
+	
+
+# 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 '
+
+
+# Add hpdj driver support for some other HP printers
+	mkdir hpdj
+	tar xzfO %{SOURCE2} hpdj-%{hpdj_ver}/hpdj.tar | tar xf - -C hpdj
+	mv hpdj/*.c hpdj/*.h src/
+	mv hpdj/*.1 man
+
+	# update the make files
+	GS_DEVS=$GS_DEVS'$(DD)hpdj.dev '
+	cat hpdj/contrib.mak-5.94.add >> src/contrib.mak
 
-patch -p0 -z .hpdjauto < tmp/zmedia2.c-%{version}.diff
-%patch4 -p1 -b .hpdj
-%patch5 -p1 -b .lxm
 
 # Add support for ALPS printers
-mv gdevmd2k-%{md2kver}/*.[ch] .
-cat gdevmd2k-%{md2kver}/gdevmd2k.mak-5.50 >>contrib.mak
-perl -pi -e "s/^DEVICE_DEVS6=/DEVICE_DEVS6=md2k.dev md5k.dev /g" unix-gcc.mak
+	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
 
-%patch6 -p1 -b .lx7000
 
-# Add the stp driver from the gimp-print project
-tar xzvf %{SOURCE12}
-cd $(basename %{SOURCE12} | sed -e 's/.tar.gz//')/Ghost
-mv *.{c,h} ../..
-cat contrib.mak.addon >> ../../contrib.mak
-cd ../../
-perl -pi -e 's/^DEVICE_DEVS6=/DEVICE_DEVS6=stp.dev /g' unix-gcc.mak
+# Add *.upp files for Epson 740
+	tar xzf %{SOURCE4}
+	mv epson740/*.upp lib/
 
-# add the lxm3270 driver
-tar xzvf %{SOURCE13}
-cd $(basename %{SOURCE13} | sed -e 's/.tar.gz//')
-mv *.c ../
-cd ..
-perl -pi -e 's/^DEVICE_DEVS6=/DEVICE_DEVS6=lxm3200.dev /g' unix-gcc.mak
-echo '
+
+# Add the gimp-print stp driver
+	tar xzf %{SOURCE5}
+	mv print-%{gimp_ver}/Ghost/*.[ch] src/
+
+	# update the make files
+	GS_DEVS=$GS_DEVS'$(DD)stp.dev '
+	cat print-%{gimp_ver}/Ghost/contrib.mak.addon >> src/contrib.mak
+
+
+# Add Daniel Gordini's lxm3200 driver
+	tar xzf %{SOURCE6}
+	mv lxm3200-%{lxm_ver}-src/*.[ch] src/
+
+	# update the make files
+	GS_DEVS=$GS_DEVS'$(DD)lxm3200.dev '
+	echo '
 ### ---------------- Lexmark 3200 device ----------------- ###
-
 lxm3200_=$(GLOBJ)gdevlx32.$(OBJ)
 
-$(GLOBJ)gdevlx32.$(OBJ): gdevlx32.c $(PDEVH) $(gsparam_h)
+$(GLOBJ)gdevlx32.$(OBJ): $(GLSRC)gdevlx32.c $(PDEVH) $(gsparam_h)
 	$(GLCC) $(GLO_)gdevlx32.$(OBJ) $(C_) $(GLSRC)gdevlx32.c
 
-lxm3200.dev: $(lxm3200_) page.dev
-	$(SETPDEV) lxm3200 $(lxm3200_)
+$(DD)lxm3200.dev: $(lxm3200_) $(DD)page.dev
+	$(SETPDEV) $(DD)lxm3200 $(lxm3200_)
 
-' >> contrib.mak
+' >> src/contrib.mak
 
-%patch12 -p1 -b .bmp16m
-%patch13 -p1 -b .gcc296
-%patch14 -p1 -b .bug19212
-%patch15 -p1
-%patch16 -p1 -b .time
-%if %{enable_japanese}
-%patch20 -p0
-%endif
-%patch21 -p0
 
-# Add -dPARANOIDSAFER option, so that we can breathe a little easier
-# in the print spooler.
-%patch17 -p1 -b .PARANOIDSAFER
+# Add the lx5000 driver
+	cp %{SOURCE7} src/
 
-rm -rf tmp
-ln -s unix-gcc.mak Makefile
+	GS_DEVS=$GS_DEVS'$(DD)lx5000.dev '
+	echo '
+### ----------------- Lexmark 5000 printer ----------------------------- ###
+### Note: this driver was contributed by users.  Please contact:         ###
+###   Peter B. West <pbwest@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 a 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
+
+
+# Patch to make gcc296 happier
+%patch3 -p1 -b .gcc296
+
+# Patch to make ps2espi better/work
+%patch14 -p1 -b .ps2epsi
+
+# 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
 
 %build
-# Ugly workaround for a bug in the dj850 driver...
-mkdir obj
-make obj/arch.h
-ln -s obj/arch.h .
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" gdevcd8.o
-mv gdevcd8.o obj
-
-%ifarch alpha
-make RPM_OPT_FLAGS="" prefix=/usr
-%else
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=/usr
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,man,doc}
-make install prefix=$RPM_BUILD_ROOT/usr mandir=$RPM_BUILD_ROOT/%{_mandir}
+mkdir -p $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/{%{_mandir},%{_bindir},%{_datadir},%{_docdir}}
+make install	prefix=$RPM_BUILD_ROOT/usr \
+		mandir=$RPM_BUILD_ROOT/%{_mandir} \
+		datadir=$RPM_BUILD_ROOT/%{_datadir} \
+		bindir=$RPM_BUILD_ROOT/%{_bindir} \
+		docdir=$RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}
+
 ln -sf gs.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/ghostscript.1.gz
 ln -sf gs $RPM_BUILD_ROOT/usr/bin/ghostscript
-strip -R .comment $RPM_BUILD_ROOT/usr/bin/gs
-mkdir ourdocs
-cp -a $RPM_BUILD_ROOT/usr/doc/ghostscript-%{PACKAGE_VERSION}/* ourdocs/
+
+cp -a Resource $RPM_BUILD_ROOT/usr/share/ghostscript/
+
+MAIN_PWD=`pwd`
+(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{version}/{lib,vflib,examples}/* | \
+		sed -e 's/\.//;' | grep -v lib/Fontmap* | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist)
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f rpm.sharelist
 %defattr(-,root,root)
-%doc ourdocs/*
 /usr/bin/*
 %dir /usr/share/ghostscript
-%dir /usr/share/ghostscript/%{PACKAGE_VERSION}
-/usr/share/ghostscript/%{PACKAGE_VERSION}/*ps
-/usr/share/ghostscript/%{PACKAGE_VERSION}/*upp
-%config /usr/share/ghostscript/%{version}/Fontmap
-/usr/share/ghostscript/%{PACKAGE_VERSION}/examples
+%dir /usr/share/ghostscript/Resource
+%dir /usr/share/ghostscript/%{version}
+%dir /usr/share/ghostscript/%{version}/lib
+%dir /usr/share/ghostscript/%{version}/vflib
+%dir /usr/share/ghostscript/%{version}/examples
+%config /usr/share/ghostscript/%{version}/lib/gs_init.ps
+%config /usr/share/ghostscript/%{version}/lib/Fontmap*
+/usr/share/ghostscript/Resource/*
 %{_mandir}/*/*
 
-%if %{enable_japanese}
-/usr/share/ghostscript/5.50/vflib/
-%endif
-
 %changelog
-* Mon Oct 01 2001 Crutcher Dunnavant <crutcher@redhat.com> 5.50-19
-- change -dPARANOIDSAFER to punch a hole for OutputFile
+* Thu Aug  9 2001 Yukihiro Nakai <ynakai@redhat.com> 6.51-5
+- Add cjk resources
 
-* Mon Sep 17 2001 Crutcher Dunnavant <crutcher@redhat.com> 5.50-18
-- add -dPARANOIDSAFER option so that we can breathe a little easier
-- in the print spooler.
+* Thu Aug  1 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-4
+- applied drepper@redhat.com's patch for #50300
+- fixed build deps on zlib-devel and libpng-devel, #49853
+- made gs_init.ps a config file; #25096
+- O\^/nZ the daTa directorieZ now; #50693
+
+* Tue Jul 24 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-3
+- wired up the Resource dir and the Font and CIDFont maps.
+
+* Mon Jul 23 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-2
+- luckily, I had a spare chicken. Thanks to some work by Nakai, and one last
+- desperate search through google, everything /seems/ to be working. I know
+- that there are going to be problems in the japanese code, and I need to turn
+- on the cjk font map from adobe, but it /works/ at the moment.
+
+* Thu Jun 21 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- upgraded to 6.51, a major version upgrade
+- rewrote spec file, threw out some patches
+- turned on IBM's Omni print drivers interface
+- 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
+
+* Wed Apr 11 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- added P. B. West's lx5000 driver
 
 * Tue Feb 27 2001 Crutcher Dunnavant <crutcher@redhat.com>
 - added xtt-fonts requirement (for VFlib)
diff --git a/sources b/sources
index 5a15d54..4ef6d03 100644
--- a/sources
+++ b/sources
@@ -1,11 +1,14 @@
+2919cf239c2d090cf4c21c890aed860e  acro4-cmaps-1999.tar.gz
+3ff23ba3f0b820fdb47eb925af35f798  adobe-cmaps-200103.tar.gz
 2c6ebfe51cab34ee61e3dd524c8640cc  epson740.tgz
 5ed2b4218b8f77cb411f3d2e4509ed24  gdevmd2k-0.2a.tar.gz
-4930c9d2feea3294904fc683bf8b8beb  ghostscript-5.50gnu.tar.gz
-14d4e72ee395c60a18a918c2d7d733d2  gnu-gs-5.50.tar.gz
-dbd5f3b47ed13132f04c685d608a7547  gnu-gs-5.50jpeg.tar.gz
-e934d1bd3a48a1c151e2a15af0640c97  gs5.50-vflib-1.0.tar.gz
+f04509c73ddc247e6b94e7dc1835d143  ghostscript-6.51-cjk.tar.gz
+6b6d2123daaa1d217aadcbba7f2d6179  ghostscript-6.51.tar.bz2
 d202cd105c496b7f0eb5221316fb7b7f  gs550j1.tar.gz
-e46bcac0aed0c511c8cc88a1093cc586  hp8xxs13.zip
+78d6761aab82e70f9c7ee3a1afd72aba  gs6.51-cjk-M2-R1.tar.gz
+57e2ef257be06ea370f1b28b7c383c94  gs650-j-vlib.zip
 dcc402281f36afd2041144e0e97917be  hpdj-2.6.tar.gz
+dbd5f3b47ed13132f04c685d608a7547  jpegsrc.v6b.tar.gz
+aea08da4e37ab68ed6f1dc451f24b30b  lexmarkgs990908.tar.gz
 ec11b9ef72ecaabb61eeba27e93f9f2b  lxm3200-0.4.1-gs5.50-src.tar.gz
-05af32e5c29d3a5657d2974352bc4286  print-4.0a3.tar.gz
+2eae88b9285d47036d31974fd2b0abc2  print-4.0.5.tar.gz