dist-git conversion

#2781)

.gitignore

@@ -22,3 +22,6 @@ ghostscript-8.60-r8117.tar.bz2
 ghostscript-8.60.tar.bz2
 ghostscript-8.61.tar.bz2
 ghostscript-8.62.tar.bz2
+ghostscript-8.63.tar.bz2
+ghostscript-8.64.tar.bz2
+ghostscript-8.70.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ghostscript
-# $Id: Makefile,v 1.1 2004/09/09 05:07:56 cvsdist Exp $
-NAME := ghostscript
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ghostscript-fPIC.patch

@@ -1,26 +1,7 @@
---- ghostscript-8.60-r8112/src/lib.mak.fPIC	2007-07-10 17:03:11.000000000 +0100
+diff -up ghostscript-8.64/base/devs.mak.fPIC ghostscript-8.64/base/devs.mak
-+++ ghostscript-8.60-r8112/src/lib.mak	2007-07-10 17:05:56.000000000 +0100
+--- ghostscript-8.64/base/devs.mak.fPIC	2008-11-07 18:49:34.000000000 +0000
-@@ -874,7 +874,7 @@
++++ ghostscript-8.64/base/devs.mak	2009-02-04 11:34:21.000000000 +0000
- $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\
+@@ -456,7 +456,7 @@ $(GLOBJ)gdevx.$(OBJ) : $(GLSRC)gdevx.c $
-  $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\
-  $(gstypes_h)
--	$(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
-+	$(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
- 
- # Future replacement for gsparams.c
- $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\
-@@ -1077,7 +1077,7 @@
- 
- # Provide a mapping between StandardEncoding and ISOLatin1Encoding.
- $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h)
--	$(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
-+	$(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
- 
- ###### Create a pseudo-"feature" for the entire graphics library.
- 
---- ghostscript-8.60-r8112/src/devs.mak.fPIC	2007-07-10 17:05:00.000000000 +0100
-+++ ghostscript-8.60-r8112/src/devs.mak	2007-07-10 17:05:07.000000000 +0100
-@@ -464,7 +464,7 @@
  	$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c
  
  $(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h)
@@ -29,3 +10,24 @@
  
  $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\
   $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h)
+diff -up ghostscript-8.64/base/lib.mak.fPIC ghostscript-8.64/base/lib.mak
+--- ghostscript-8.64/base/lib.mak.fPIC	2009-01-08 09:17:18.000000000 +0000
++++ ghostscript-8.64/base/lib.mak	2009-02-04 11:34:21.000000000 +0000
+@@ -894,7 +894,7 @@ $(GLOBJ)gsparam.$(OBJ) : $(GLSRC)gsparam
+ $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\
+  $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\
+  $(gstypes_h)
+-	$(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
++	$(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
+ 
+ # Future replacement for gsparams.c
+ $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\
+@@ -1085,7 +1085,7 @@ $(GLOBJ)gdevnfwd.$(OBJ) : $(GLSRC)gdevnf
+ 
+ # Provide a mapping between StandardEncoding and ISOLatin1Encoding.
+ $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h)
+-	$(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
++	$(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
+ 
+ ###### Create a pseudo-"feature" for the entire graphics library.
+ 

ghostscript-gs-executable.patch

@@ -0,0 +1,361 @@
+diff -up ghostscript-8.70/lib/bdftops.gs-executable ghostscript-8.70/lib/bdftops
+--- ghostscript-8.70/lib/bdftops.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/bdftops	2009-08-03 17:53:20.569875831 +0100
+@@ -6,8 +6,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -dBATCH -dNODISPLAY -- bdftops.ps "$@"
++exec "$gs" -q -dBATCH -dNODISPLAY -- bdftops.ps "$@"
+diff -up ghostscript-8.70/lib/dumphint.gs-executable ghostscript-8.70/lib/dumphint
+--- ghostscript-8.70/lib/dumphint.gs-executable	2009-01-04 20:11:57.000000000 +0000
++++ ghostscript-8.70/lib/dumphint	2009-08-03 17:53:20.570875283 +0100
+@@ -7,9 +7,8 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+ 
+ OPTIONS="-dSAFER -dDELAYSAFER"
+@@ -27,4 +26,4 @@ if [ $# -ne 1 ]; then
+ 	exit 1
+ fi
+ 
+-exec "$GS_EXECUTABLE" -q -dNODISPLAY $OPTIONS -- "`dirname $0`/dumphint.ps" "$1"
++exec "$gs" -q -dNODISPLAY $OPTIONS -- "`dirname $0`/dumphint.ps" "$1"
+diff -up ghostscript-8.70/lib/eps2eps.gs-executable ghostscript-8.70/lib/eps2eps
+--- ghostscript-8.70/lib/eps2eps.gs-executable	2009-01-10 22:11:18.000000000 +0000
++++ ghostscript-8.70/lib/eps2eps	2009-08-03 17:53:20.573877995 +0100
+@@ -7,9 +7,8 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+ OPTIONS="-dDEVICEWIDTH=250000 -dDEVICEHEIGHT=250000"
+ while true
+@@ -26,4 +25,4 @@ if [ $# -ne 2 ]; then
+ 	exit 1
+ fi
+ 
+-exec "$GS_EXECUTABLE" -q -sDEVICE=epswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
++exec "$gs" -q -sDEVICE=epswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
+diff -up ghostscript-8.70/lib/font2c.gs-executable ghostscript-8.70/lib/font2c
+--- ghostscript-8.70/lib/font2c.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/font2c	2009-08-03 17:53:20.576874823 +0100
+@@ -6,8 +6,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -dNODISPLAY -dWRITESYSTEMDICT -- font2c.ps "$@"
++exec "$gs" -q -dNODISPLAY -dWRITESYSTEMDICT -- font2c.ps "$@"
+diff -up ghostscript-8.70/lib/gsbj.gs-executable ghostscript-8.70/lib/gsbj
+--- ghostscript-8.70/lib/gsbj.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gsbj	2009-08-03 17:53:20.579874829 +0100
+@@ -6,8 +6,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -sDEVICE=bj10e -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
++exec "$gs" -q -sDEVICE=bj10e -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
+diff -up ghostscript-8.70/lib/gsdj500.gs-executable ghostscript-8.70/lib/gsdj500
+--- ghostscript-8.70/lib/gsdj500.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gsdj500	2009-08-03 17:53:20.582874574 +0100
+@@ -6,8 +6,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -sDEVICE=djet500 -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
++exec "$gs" -q -sDEVICE=djet500 -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
+diff -up ghostscript-8.70/lib/gsdj.gs-executable ghostscript-8.70/lib/gsdj
+--- ghostscript-8.70/lib/gsdj.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gsdj	2009-08-03 17:53:20.585875161 +0100
+@@ -6,8 +6,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -sDEVICE=deskjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
++exec "$gs" -q -sDEVICE=deskjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
+diff -up ghostscript-8.70/lib/gslj.gs-executable ghostscript-8.70/lib/gslj
+--- ghostscript-8.70/lib/gslj.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gslj	2009-08-03 17:53:20.588874966 +0100
+@@ -6,8 +6,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -sDEVICE=laserjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
++exec "$gs" -q -sDEVICE=laserjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
+diff -up ghostscript-8.70/lib/gslp.gs-executable ghostscript-8.70/lib/gslp
+--- ghostscript-8.70/lib/gslp.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gslp	2009-08-03 17:53:20.591874666 +0100
+@@ -6,8 +6,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -sDEVICE=epson -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
++exec "$gs" -q -sDEVICE=epson -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
+diff -up ghostscript-8.70/lib/gsnd.gs-executable ghostscript-8.70/lib/gsnd
+--- ghostscript-8.70/lib/gsnd.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/gsnd	2009-08-03 17:53:20.594874682 +0100
+@@ -6,8 +6,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -dNODISPLAY "$@"
++exec "$gs" -dNODISPLAY "$@"
+diff -up ghostscript-8.70/lib/pdf2dsc.gs-executable ghostscript-8.70/lib/pdf2dsc
+--- ghostscript-8.70/lib/pdf2dsc.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/pdf2dsc	2009-08-03 17:53:20.597874954 +0100
+@@ -11,9 +11,8 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+ me=`basename $0`
+ 
+@@ -31,5 +30,5 @@ pdffile=$1
+ dscfile=$2
+ : ${dscfile:=`echo $pdffile | sed 's,\.[^/.]*,,'`.dsc}
+ 
+-exec "$GS_EXECUTABLE" -q -dNODISPLAY -dSAFER -dDELAYSAFER\
++exec "$gs" -q -dNODISPLAY -dSAFER -dDELAYSAFER\
+     -sPDFname="$pdffile" -sDSCname="$dscfile" pdf2dsc.ps -c quit
+diff -up ghostscript-8.70/lib/pdf2ps.gs-executable ghostscript-8.70/lib/pdf2ps
+--- ghostscript-8.70/lib/pdf2ps.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/pdf2ps	2009-08-03 17:53:20.601874677 +0100
+@@ -7,9 +7,8 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+ OPTIONS=""
+ while true
+@@ -35,4 +34,4 @@ fi
+ # Doing an initial 'save' helps keep fonts from being flushed between pages.
+ # We have to include the options twice because -I only takes effect if it
+ # appears before other options.
+-exec "$GS_EXECUTABLE" $OPTIONS -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pswrite "-sOutputFile=$outfile" $OPTIONS -c save pop -f "$1"
++exec "$gs" $OPTIONS -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pswrite "-sOutputFile=$outfile" $OPTIONS -c save pop -f "$1"
+diff -up ghostscript-8.70/lib/pdfopt.gs-executable ghostscript-8.70/lib/pdfopt
+--- ghostscript-8.70/lib/pdfopt.gs-executable	2008-05-25 03:17:14.000000000 +0100
++++ ghostscript-8.70/lib/pdfopt	2009-08-03 17:53:20.604874898 +0100
+@@ -7,9 +7,8 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+ OPTIONS="-dSAFER -dDELAYSAFER"
+ while true
+@@ -26,4 +25,4 @@ if [ $# -ne 2 ]; then
+ 	exit 1
+ fi
+ 
+-exec "$GS_EXECUTABLE" -q -dNODISPLAY $OPTIONS -- pdfopt.ps "$1" "$2"
++exec "$gs" -q -dNODISPLAY $OPTIONS -- pdfopt.ps "$1" "$2"
+diff -up ghostscript-8.70/lib/pf2afm.gs-executable ghostscript-8.70/lib/pf2afm
+--- ghostscript-8.70/lib/pf2afm.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/pf2afm	2009-08-03 17:53:20.608874740 +0100
+@@ -10,8 +10,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -dNODISPLAY -dSAFER -dDELAYSAFER  -- pf2afm.ps "$@"
++exec "$gs" -q -dNODISPLAY -dSAFER -dDELAYSAFER  -- pf2afm.ps "$@"
+diff -up ghostscript-8.70/lib/pfbtopfa.gs-executable ghostscript-8.70/lib/pfbtopfa
+--- ghostscript-8.70/lib/pfbtopfa.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/pfbtopfa	2009-08-03 17:53:20.612874691 +0100
+@@ -7,9 +7,8 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+ if [ $# -eq 2 ] 
+ then
+@@ -22,4 +21,4 @@ else
+     exit 1
+ fi
+ 
+-exec "$GS_EXECUTABLE" -q -dNODISPLAY -- pfbtopfa.ps "$1" "$outfile"
++exec "$gs" -q -dNODISPLAY -- pfbtopfa.ps "$1" "$outfile"
+diff -up ghostscript-8.70/lib/pphs.gs-executable ghostscript-8.70/lib/pphs
+--- ghostscript-8.70/lib/pphs.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/pphs	2009-08-03 17:53:20.616874647 +0100
+@@ -9,8 +9,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -dNODISPLAY -- pphs.ps "$@"
++exec "$gs" -q -dNODISPLAY -- pphs.ps "$@"
+diff -up ghostscript-8.70/lib/printafm.gs-executable ghostscript-8.70/lib/printafm
+--- ghostscript-8.70/lib/printafm.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/printafm	2009-08-03 17:53:20.619874766 +0100
+@@ -9,8 +9,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -dNODISPLAY -- printafm.ps "$@"
++exec "$gs" -q -dNODISPLAY -- printafm.ps "$@"
+diff -up ghostscript-8.70/lib/ps2epsi.gs-executable ghostscript-8.70/lib/ps2epsi
+--- ghostscript-8.70/lib/ps2epsi.gs-executable	2009-04-07 11:20:02.000000000 +0100
++++ ghostscript-8.70/lib/ps2epsi	2009-08-03 17:54:48.355750266 +0100
+@@ -6,9 +6,8 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+ # try to create a temporary file securely
+ if test -z "$TMPDIR"; then
+@@ -50,7 +49,7 @@ else
+ 	outfile=$2
+ fi
+ 
+-"$GS_EXECUTABLE" -q -dBATCH -dNOPAUSE -dSAFER -dDELAYSAFER -sDEVICE=bbox -sOutputFile=/dev/null "${infile}" 2>${outfile}
++"$gs" -q -dBATCH -dNOPAUSE -dSAFER -dDELAYSAFER -sDEVICE=bbox -sOutputFile=/dev/null "${infile}" 2>${outfile}
+ 
+ ls -l "${infile}" |
+ awk 'F==1	{
+@@ -92,7 +91,7 @@ awk 'F==1	{
+ 		}
+ 	' F=1 - F=2 "${outfile}" >>"$tmpfile"
+ 
+-"$GS_EXECUTABLE" -q -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
++"$gs" -q -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
+ rm -f "$tmpfile"
+ rm -rf "$tmpdir"
+ 
+diff -up ghostscript-8.70/lib/ps2pdfwr.gs-executable ghostscript-8.70/lib/ps2pdfwr
+--- ghostscript-8.70/lib/ps2pdfwr.gs-executable	2009-01-10 22:11:18.000000000 +0000
++++ ghostscript-8.70/lib/ps2pdfwr	2009-08-03 17:53:20.626874926 +0100
+@@ -7,9 +7,8 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+ OPTIONS="-dSAFER"
+ while true
+@@ -42,4 +41,4 @@ fi
+ 
+ # We have to include the options twice because -I only takes effect if it
+ # appears before other options.
+-exec "$GS_EXECUTABLE" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
++exec "$gs" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
+diff -up ghostscript-8.70/lib/ps2ps.gs-executable ghostscript-8.70/lib/ps2ps
+--- ghostscript-8.70/lib/ps2ps.gs-executable	2009-01-10 22:11:18.000000000 +0000
++++ ghostscript-8.70/lib/ps2ps	2009-08-03 17:53:20.630875037 +0100
+@@ -7,9 +7,8 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+ OPTIONS="-dSAFER"
+ while true
+@@ -27,4 +26,4 @@ if [ $# -ne 2 ]; then
+ 	exit 1
+ fi
+ 
+-exec "$GS_EXECUTABLE" -q -sDEVICE=pswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
++exec "$gs" -q -sDEVICE=pswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
+diff -up ghostscript-8.70/lib/wftopfa.gs-executable ghostscript-8.70/lib/wftopfa
+--- ghostscript-8.70/lib/wftopfa.gs-executable	2007-07-05 20:04:29.000000000 +0100
++++ ghostscript-8.70/lib/wftopfa	2009-08-03 17:53:20.633874780 +0100
+@@ -6,8 +6,7 @@
+ GS_EXECUTABLE=gs
+ gs="`dirname $0`/$GS_EXECUTABLE"
+ if test ! -x "$gs"; then
+-	gs="$GS_EXECUTABLE"
++	gs="$gs"
+ fi
+-GS_EXECUTABLE="$gs"
+ 
+-exec "$GS_EXECUTABLE" -q -dNODISPLAY -- wftopfa.ps "$@"
++exec "$gs" -q -dNODISPLAY -- wftopfa.ps "$@"

ghostscript-jbig2dec-nullderef.patch

@@ -0,0 +1,81 @@
+diff -up ghostscript-8.70/jbig2dec/jbig2_generic.c.jbig2dec-nullderef ghostscript-8.70/jbig2dec/jbig2_generic.c
+--- ghostscript-8.70/jbig2dec/jbig2_generic.c.jbig2dec-nullderef	2009-05-29 07:48:44.000000000 +0100
++++ ghostscript-8.70/jbig2dec/jbig2_generic.c	2009-08-03 17:51:13.864875636 +0100
+@@ -596,6 +596,10 @@ jbig2_immediate_generic_region(Jbig2Ctx 
+   memcpy (params.gbat, gbat, gbat_bytes);
+ 
+   image = jbig2_image_new(ctx, rsi.width, rsi.height);
++  if (image == NULL)
++    return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
++		       "failed to allocate buffer for image");
++
+   jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+     "allocated %d x %d image buffer for region decode results",
+         rsi.width, rsi.height);
+diff -up ghostscript-8.70/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef ghostscript-8.70/jbig2dec/jbig2_symbol_dict.c
+--- ghostscript-8.70/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef	2009-05-29 07:48:44.000000000 +0100
++++ ghostscript-8.70/jbig2dec/jbig2_symbol_dict.c	2009-08-03 17:52:35.318750131 +0100
+@@ -367,6 +367,11 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 		  memcpy(region_params.gbat, params->sdat, sdat_bytes);
+ 
+ 		  image = jbig2_image_new(ctx, SYMWIDTH, HCHEIGHT);
++		  if (image == NULL) {
++		      jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
++				  "failed to allocate image storage");
++		      return NULL;
++		  }
+ 
+ 		  code = jbig2_decode_generic_region(ctx, segment, &region_params,
+ 						     as, image, GB_stats);
+@@ -517,6 +522,11 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 			ID, RDX, RDY);
+ 
+ 		      image = jbig2_image_new(ctx, SYMWIDTH, HCHEIGHT);
++		      if (image == NULL) {
++			  jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
++				      "failed to allocate image storage");
++			  return NULL;
++		      }
+ 
+ 		      /* Table 18 */
+ 		      rparams.GRTEMPLATE = params->SDRTEMPLATE;
+@@ -635,6 +645,16 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 	for (j = HCFIRSTSYM; j < NSYMSDECODED; j++) {
+ 	  Jbig2Image *glyph;
+ 	  glyph = jbig2_image_new(ctx, SDNEWSYMWIDTHS[j], HCHEIGHT);
++	  if (glyph == NULL) {
++	      jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
++			  "error allocating image storage for glyph");
++	      while (--j >= HCFIRSTSYM) {
++		  jbig2_image_release(ctx, SDNEWSYMS->glyphs[j]);
++		  SDNEWSYMS->glyphs[j] = NULL;
++	      }
++	      jbig2_image_release(ctx, image);
++	      return NULL;
++	  }
+ 	  jbig2_image_compose(ctx, glyph, image,
+ 		-x, 0, JBIG2_COMPOSE_REPLACE);
+ 	  x += SDNEWSYMWIDTHS[j];
+diff -up ghostscript-8.70/jbig2dec/jbig2_text.c.jbig2dec-nullderef ghostscript-8.70/jbig2dec/jbig2_text.c
+--- ghostscript-8.70/jbig2dec/jbig2_text.c.jbig2dec-nullderef	2009-05-29 07:48:44.000000000 +0100
++++ ghostscript-8.70/jbig2dec/jbig2_text.c	2009-08-03 17:53:05.166750610 +0100
+@@ -312,6 +312,9 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, 
+ 		IBO = IB;
+ 		refimage = jbig2_image_new(ctx, IBO->width + RDW,
+ 						IBO->height + RDH);
++		if (image == NULL)
++		    return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
++				       "could not allocate image storage");
+ 
+ 		/* Table 12 */
+ 		rparams.GRTEMPLATE = params->SBRTEMPLATE;
+@@ -676,6 +679,9 @@ jbig2_parse_text_region(Jbig2Ctx *ctx, J
+     }
+ 
+     image = jbig2_image_new(ctx, region_info.width, region_info.height);
++    if (image == NULL)
++	return jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
++			   "unable to allocate image storage");
+ 
+     ws = jbig2_word_stream_buf_new(ctx, segment_data + offset, segment->data_length - offset);
+     if (!params.SBHUFF) {

ghostscript-noopt.patch

@@ -1,6 +1,7 @@
---- ghostscript-7.07/src/int.mak.noopt	2005-03-10 17:22:53.000000000 +0000
+diff -up ghostscript-8.64/psi/int.mak.noopt ghostscript-8.64/psi/int.mak
-+++ ghostscript-7.07/src/int.mak	2005-03-10 17:24:10.000000000 +0000
+--- ghostscript-8.64/psi/int.mak.noopt	2008-12-26 07:25:31.000000000 +0000
-@@ -105,7 +105,7 @@
++++ ghostscript-8.64/psi/int.mak	2009-02-04 11:33:48.000000000 +0000
+@@ -111,7 +111,7 @@ $(PSOBJ)igc.$(OBJ) : $(PSSRC)igc.c $(GH)
  $(PSOBJ)igcref.$(OBJ) : $(PSSRC)igcref.c $(GH) $(memory__h)\
   $(gsexit_h) $(gsstruct_h)\
   $(iastate_h) $(idebug_h) $(igc_h) $(iname_h) $(ipacked_h) $(store_h)

ghostscript-pksmraw.patch

@@ -1,7 +1,7 @@
-diff -up ghostscript-8.62/src/gxclrast.c.pksmraw ghostscript-8.62/src/gxclrast.c
+diff -up ghostscript-8.64/base/gxclrast.c.pksmraw ghostscript-8.64/base/gxclrast.c
---- ghostscript-8.62/src/gxclrast.c.pksmraw	2008-03-31 17:24:32.000000000 +0100
+--- ghostscript-8.64/base/gxclrast.c.pksmraw	2008-12-13 20:05:37.000000000 +0000
-+++ ghostscript-8.62/src/gxclrast.c	2008-03-31 17:25:33.000000000 +0100
++++ ghostscript-8.64/base/gxclrast.c	2009-02-04 11:36:25.000000000 +0000
-@@ -2606,8 +2606,6 @@ static int apply_create_compositor(gx_de
+@@ -2685,8 +2685,6 @@ static int apply_create_compositor(gx_de
          rc_increment(tdev);
          *ptarget = tdev;
      }

ghostscript-runlibfileifexists.patch

@@ -1,7 +1,7 @@
-diff -up ghostscript-8.61/lib/gs_init.ps.runlibfileifexists ghostscript-8.61/lib/gs_init.ps
+diff -up ghostscript-8.64/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-8.64/Resource/Init/gs_init.ps
---- ghostscript-8.61/lib/gs_init.ps.runlibfileifexists	2007-10-31 17:00:55.000000000 +0000
+--- ghostscript-8.64/Resource/Init/gs_init.ps.runlibfileifexists	2009-01-08 09:17:18.000000000 +0000
-+++ ghostscript-8.61/lib/gs_init.ps	2007-11-30 09:02:19.000000000 +0000
++++ ghostscript-8.64/Resource/Init/gs_init.ps	2009-02-04 11:35:19.000000000 +0000
-@@ -671,6 +671,14 @@ systemdict /internaldict dup .makeintern
+@@ -672,6 +672,14 @@ systemdict /internaldict dup .makeintern
  	   { /undefinedfilename signalerror }
  	  ifelse
  	} bind def
@@ -16,7 +16,7 @@ diff -up ghostscript-8.61/lib/gs_init.ps.runlibfileifexists ghostscript-8.61/lib
  /selectdevice
  	{ finddevice setdevice .setdefaultscreen } bind def
  /signalerror		% <object> <errorname> signalerror -
-@@ -839,6 +847,7 @@ userdict /.currentresourcefile //null pu
+@@ -840,6 +848,7 @@ userdict /.currentresourcefile //null pu
  	} bind def
  % Temporarily substitute it for the real runlibfile.
  /.runlibfile /runlibfile load def

ghostscript-scripts.patch

@@ -1,6 +1,16 @@
---- ghostscript-8.60-r8112/lib/pv.sh.scripts	2007-07-05 11:41:52.000000000 +0100
+diff -up ghostscript-8.64/lib/dvipdf.scripts ghostscript-8.64/lib/dvipdf
-+++ ghostscript-8.60-r8112/lib/pv.sh	2007-07-10 16:08:47.000000000 +0100
+--- ghostscript-8.64/lib/dvipdf.scripts	2009-01-10 22:11:18.000000000 +0000
-@@ -31,7 +31,7 @@
++++ ghostscript-8.64/lib/dvipdf	2009-02-04 11:32:31.000000000 +0000
+@@ -44,4 +44,4 @@ fi
+ 
+ # We have to include the options twice because -I only takes effect if it
+ # appears before other options.
+-exec dvips -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
++exec dvips -R -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
+diff -up ghostscript-8.64/lib/pv.sh.scripts ghostscript-8.64/lib/pv.sh
+--- ghostscript-8.64/lib/pv.sh.scripts	2007-07-05 11:41:52.000000000 +0100
++++ ghostscript-8.64/lib/pv.sh	2009-02-04 11:31:32.000000000 +0000
+@@ -31,7 +31,7 @@ fi
  GS_EXECUTABLE=gs
  
  TEMPDIR=.
@@ -9,7 +19,7 @@
  shift
  FILE="$1"
  shift
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ else
  	tmpfile="$TEMPDIR/$FILE.$$.pv"
  fi
  trap "rm -rf $tmpfile" 0 1 2 15
@@ -19,11 +29,3 @@
 +dvips -R -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
  $GS_EXECUTABLE $tmpfile
  exit 0
---- ghostscript-8.60-r8112/lib/dvipdf.scripts	2007-07-10 16:08:57.000000000 +0100
-+++ ghostscript-8.60-r8112/lib/dvipdf	2007-07-10 16:09:17.000000000 +0100
-@@ -44,4 +44,4 @@
- 
- # We have to include the options twice because -I only takes effect if it
- # appears before other options.
--exec dvips $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
-+exec dvips -R $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -

ghostscript-system-jasper.patch

@@ -1,6 +1,6 @@
-diff -up ghostscript-8.61/src/sjpx.c.system-jasper ghostscript-8.61/src/sjpx.c
+diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c
---- ghostscript-8.61/src/sjpx.c.system-jasper	2008-02-22 14:10:00.000000000 +0000
+--- ghostscript-8.64/base/sjpx.c.system-jasper	2008-08-21 00:22:49.000000000 +0100
-+++ ghostscript-8.61/src/sjpx.c	2008-02-22 14:10:15.000000000 +0000
++++ ghostscript-8.64/base/sjpx.c	2009-02-04 11:35:56.000000000 +0000
 @@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s
  private_st_jpxd_state(); /* creates a gc object for our state,
  			    defined in sjpx.h */

ghostscript.spec

@@ -1,13 +1,15 @@
-%define gs_ver 8.62
+%define gs_ver 8.70
-%define gs_dot_ver 8.62
+%define gs_dot_ver 8.70
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
-Summary: A PostScript(TM) interpreter and renderer.
+Summary: A PostScript interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 3%{?dist}
+Release: 1%{?dist}
 
-License: GPLv2
+# Included CMap data is Redistributable, no modification permitted,
+# see http://bugzilla.redhat.com/487510
+License: GPLv3+ and Redistributable, no modification permitted
 URL: http://www.ghostscript.com/
 Group: Applications/Publishing
 Source0: ghostscript-%{gs_ver}.tar.bz2
@@ -21,6 +23,8 @@ Patch4: ghostscript-fPIC.patch
 Patch5: ghostscript-runlibfileifexists.patch
 Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
+Patch8: ghostscript-jbig2dec-nullderef.patch
+Patch9: ghostscript-gs-executable.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -42,7 +46,7 @@ Conflicts: ttfonts-zh_CN < 2.12-2
 Conflicts: ttfonts-zh_TW < 2.11-20
 
 %description
-Ghostscript is a set of software that provides a PostScript(TM)
+Ghostscript is a set of software that provides a PostScript
 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
@@ -64,8 +68,16 @@ Group: Development/Libraries
 %description devel
 The header files for developing applications that use ghostscript.
 
+%package doc
+Summary: Documentation for ghostscript.
+Requires: %{name} = %{version}-%{release}
+Group: Documentation
+
+%description doc
+The documentation files that come with ghostscript.
+
 %package gtk
-Summary: A GTK-enabled PostScript(TM) interpreter and renderer.
+Summary: A GTK-enabled PostScript interpreter and renderer.
 Requires: %{name} = %{version}-%{release}
 Group: Applications/Publishing
 
@@ -89,13 +101,19 @@ rm -rf libpng zlib jpeg jasper
 %patch4 -p1 -b .fPIC
 
 # Define .runlibfileifexists.
-%patch5 -p1 -b .runlibfileifexists
+%patch5 -p1
 
 %patch6 -p1 -b .system-jasper
 
-# Fix pksmraw output (bug #308211).
+# Fix pksmraw output (bug #308211).  Still needed in 8.63.
 %patch7 -p1 -b .pksmraw
 
+# Applied patch to fix NULL dereference in JBIG2 decoder (bug #501710).
+%patch8 -p1 -b .jbig2dec-nullderef
+
+# Fix scripts so they don't get broken on install (bug #502550).
+%patch9 -p1 -b .gs-executable
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -103,14 +121,18 @@ from8859_1() {
 }
 for i in man/de/*.1; do from8859_1 "$i"; done
 
-if [ -x autogen.sh ]; then
-  ./autogen.sh
-  pushd ijs
-  ./autogen.sh
-  popd
-fi
-
 %build
+# Compile without strict aliasing opts due to these files:
+# gdevescv.c gdevl4v.c gdevopvp.c gdevbbox.c gdevdbit.c gdevddrw.c 
+# gdevp14.c gdevpdfd.c gdevpdfi.c gdevpdfo.c gdevpdft.c gdevpdfv.c 
+# gdevpdte.c gdevpdtt.c gdevps.c gdevpx.c gscoord.c gscparam.c gscrd.c 
+# gsdps1.c gsimage.c gspath1.c gsptype1.c gsptype2.c gstype2.c 
+# gstype42.c gxccache.c gxchar.c gxclimag.c gxclpath.c gxfcopy.c 
+# gximag3x.c gximage3.c gxipixel.c gxshade1.c gxstroke.c gxtype1.c 
+# ibnum.c iscanbin.c zchar1.c zchar.c zcharx.c zfapi.c zfont32.c 
+# zfunc0.c zfunc3.c zfunc4.c zpcolor.c zshade.c
+EXTRACFLAGS="-fno-strict-aliasing"
+
 FONTPATH=
 for path in \
 	%{_datadir}/fonts/default/%{name} \
@@ -125,25 +147,27 @@ do
   FONTPATH="$FONTPATH${FONTPATH:+:}$path"
 done
 %configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" \
-	--with-drivers=ALL --disable-compile-inits
+	--with-drivers=ALL --disable-compile-inits \
+	CFLAGS="$CFLAGS $EXTRACFLAGS"
 
 # Build IJS
 cd ijs
-automake --add-missing --copy || : # Ships with broken symlinks
+./autogen.sh
 %configure --enable-shared --enable-static
 make
 cd ..
 
 %if %{build_with_freetype}
 FT_CFLAGS=$(pkg-config --cflags freetype2)
-make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix} \
 	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix} \
 	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
 %else
-make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
+make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix}
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix}
 %endif
+make cups
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -156,7 +180,7 @@ make install soinstall \
 	prefix=$RPM_BUILD_ROOT%{_prefix} \
 	mandir=$RPM_BUILD_ROOT%{_mandir} \
 	datadir=$RPM_BUILD_ROOT%{_datadir} \
-	gsincludedir=$RPM_BUILD_ROOT%{_includedir}/ghostscript \
+	gsincludedir=$RPM_BUILD_ROOT%{_includedir}/ghostscript/ \
 	bindir=$RPM_BUILD_ROOT%{_bindir} \
 	libdir=$RPM_BUILD_ROOT%{_libdir} \
 	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_dot_ver} \
@@ -177,18 +201,15 @@ echo ".so man1/gs.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/ghostscript.1
 ln -sf gs $RPM_BUILD_ROOT/usr/bin/ghostscript
 
 # Rename an original cidfmap to cidfmap.GS
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap{,.GS}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource/Init/cidfmap{,.GS}
 # Install our own cidfmap to allow the separated
 # cidfmap which the font packages own.
-install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/CIDFnmap
+install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource/Init/CIDFnmap
-install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap
+install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource/Init/cidfmap
 
 # Header files.
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/ghostscript
-install -m0644 src/iapi.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
+install -m0644 base/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
-install -m0644 src/ierrors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
-install -m0644 src/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
-install -m0644 src/gdevdsp.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 
 # Don't ship pkgconfig files.
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc
@@ -201,9 +222,6 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/cups
 rm -f $RPM_BUILD_ROOT%{_libdir}/cups/filter/pstoraster
 rm -f $RPM_BUILD_ROOT/usr/lib/cups/filter/pstoraster
 
-# Don't ship two copies of Resource.  Just the versioned one will do.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/Resource
-
 # Don't ship URW fonts; we already have them.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Font
 
@@ -216,9 +234,12 @@ touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/CIDFnmap.local
 # The man/de/man1 symlinks are broken (bug #66238).
 find $RPM_BUILD_ROOT%{_mandir}/de/man1 -type l | xargs rm -f
 
+# Don't ship fixmswrd.pl as it pulls in perl (bug #463948).
+rm -f $RPM_BUILD_ROOT%{_bindir}/fixmswrd.pl
+
 MAIN_PWD=`pwd`
-(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_dot_ver}/lib -type f | \
+(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_dot_ver}/Resource -type f | \
-		sed -e 's/\.//;' | grep -v lib/Fontmap* | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist
+		sed -e 's/\.//;' | grep -v Fontmap | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist
  find .%{_bindir}/ | sed -e 's/\.//;' | \
 		grep -v '/$\|/hpijs$\|/gsx$\|/ijs-config$' \
 		>> $MAIN_PWD/rpm.sharelist)
@@ -237,14 +258,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/ghostscript
 %dir %{_datadir}/ghostscript/conf.d
 %dir %{_datadir}/ghostscript/%{gs_dot_ver}
-%dir %{_datadir}/ghostscript/%{gs_dot_ver}/lib
+%dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource
-%config %{_datadir}/ghostscript/%{gs_dot_ver}/lib/gs_init.ps
+%dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init
-%config %{_datadir}/ghostscript/%{gs_dot_ver}/lib/Fontmap*
+%config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/gs_init.ps
-%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/
+%config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/Fontmap*
-%{_datadir}/ghostscript/%{gs_dot_ver}/examples
+%{_datadir}/ghostscript/%{gs_dot_ver}/lib
 %{_mandir}/man*/*
 %lang(de) %{_mandir}/de/man*/*
-%doc %{_docdir}/%{name}-%{gs_dot_ver}
 %{_libdir}/libgs.so.*
 %{_libdir}/libijs-*.so*
 %dir %{_libdir}/%{name}
@@ -252,6 +272,12 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/cups/filter/pstopxl
 %{_datadir}/cups/model/pxl*
 %config(noreplace) /etc/ghostscript/%{gs_dot_ver}/*
+/usr/lib/cups/filter/pdftoraster
+
+%files doc
+%defattr(-,root,root)
+%doc %{_datadir}/ghostscript/%{gs_dot_ver}/examples
+%doc %{_docdir}/%{name}-%{gs_dot_ver}
 
 %files gtk
 %defattr(-,root,root)
@@ -269,6 +295,78 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Mon Aug  3 2009 Tim Waugh <twaugh@redhat.com> 8.70-1
+- 8.70.
+- License has changed to GPLv3+.  Packages containing programs that
+  link to libgs/libijs are:
+  - foomatic (GPLv2+)
+  - libspectre (GPLv2+)
+  - ImageMagick (ImageMagick, listed on Licensing wiki page under
+    "Good Licenses" and marked as GPLv3 compat)
+  - gutenprint (GPLv2+)
+
+* Mon Aug  3 2009 Tim Waugh <twaugh@redhat.com> 8.64-12
+- Moved examples to doc subpackage (bug #515167).
+- Converted spec file to UTF-8.
+
+* Thu Jul 30 2009 Tim Waugh <twaugh@redhat.com> 8.64-11
+- Fixed CVE-2009-0583,0584 patch by using 255 as the maximum number of
+  points, not 100, and by not treating a missing black point tag as an
+  error (bug #487744).
+
+* Thu Jul 30 2009 Rex Dieter <rdieter@fedoraproject.org> - 8.64-10
+- License: GPLv2 and Redistributable, no modification permitted (bug #487510)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.64-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 10 2009 Tim Waugh <twaugh@redhat.com> 8.64-8
+- Fix scripts so they don't get broken on install (bug #502550).
+
+* Thu Jun  4 2009 Tim Waugh <twaugh@redhat.com> 8.64-7
+- Applied patch to fix NULL dereference in JBIG2 decoder (bug #503995).
+
+* Wed Apr 15 2009 Tim Waugh <twaugh@redhat.com> 8.64-6
+- Applied patch to fix CVE-2009-0792 (bug #491853).
+- Applied patch to fix CVE-2009-0196 (bug #493379).
+
+* Fri Mar 20 2009 Tim Waugh <twaugh@redhat.com> 8.64-5
+- Applied patch to fix CVE-2009-0583 (bug #487742) and CVE-2009-0584
+  (bug #487744).
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.64-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 17 2009 Tim Waugh <twaugh@redhat.com> 8.64-3
+- Fix bitcmyk driver (bug #486644).
+
+* Wed Feb  4 2009 Tim Waugh <twaugh@redhat.com> 8.64-2
+- 8.64 (bug #483958).
+- Removed trade marks to avoid any potential confusion.
+
+* Fri Oct 17 2008 Tim Waugh <twaugh@redhat.com>
+- Removed last patch (unsuccessful).
+
+* Fri Oct 17 2008 Tim Waugh <twaugh@redhat.com> 8.63-4
+- Try out a work-around for bug #465311.
+
+* Wed Oct 15 2008 Tim Waugh <twaugh@redhat.com> 8.63-3
+- Don't ship fixmswrd.pl as it pulls in perl (bug #463948).
+
+* Tue Oct 14 2008 Tim Waugh <twaugh@redhat.com> 8.63-2
+- Split out a doc sub-package (bug #466507).
+
+* Mon Aug  4 2008 Tim Waugh <twaugh@redhat.com> 8.63-1
+- 8.63.  No longer need r8591 or incomplete-ccittfax patches.
+- Compile without strict aliasing opts due to warnings across several
+  files.
+- Don't run autogen.sh for main package, just for ijs which doesn't
+  ship with a configure script.
+
+* Mon Jun 23 2008 Tim Waugh <twaugh@redhat.com> 8.62-4
+- Applied patch to work around bug #229174.
+- Applied patch from upstream to fix box_fill_path for shfill (bug #452348).
+
 * Mon Mar 31 2008 Tim Waugh <twaugh@redhat.com> 8.62-3
 - Fix pksmraw output (bug #308211).
 
@@ -952,7 +1050,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Jul 13 2000 Prospector <bugzilla@redhat.com>
 - automatic rebuild
 
-* Fri Jul 07 2000 Trond Eivind Glomsrød <teg@redhat.com>
+* Fri Jul 07 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - fixed the broken inclusion of files in /usr/doc
 - Build requires freetype-devel
 

sources

@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
-40d673a3c6e11d2bf14f972b84551104  ghostscript-8.62.tar.bz2
+526366f8cb4fda0d3d293597cc5b984b  ghostscript-8.70.tar.bz2