rpms/ghostscript/F-10 ghostscript-gs-executable.patch, NONE, 1.1 ghostscript.spec, 1.181, 1.182
Tim Waugh
twaugh at fedoraproject.org
Wed Jun 10 17:00:47 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/ghostscript/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv520
Modified Files:
ghostscript.spec
Added Files:
ghostscript-gs-executable.patch
Log Message:
* Wed Jun 10 2009 Tim Waugh <twaugh at redhat.com> 8.63-8
- Fix scripts so they don't get broken on install (bug #502550).
ghostscript-gs-executable.patch:
--- NEW FILE ghostscript-gs-executable.patch ---
diff -up ghostscript-8.63/lib/bdftops.gs-executable ghostscript-8.63/lib/bdftops
--- ghostscript-8.63/lib/bdftops.gs-executable 2009-06-10 17:47:31.185482938 +0100
+++ ghostscript-8.63/lib/bdftops 2009-06-10 17:47:31.187484760 +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.63/lib/dumphint.gs-executable ghostscript-8.63/lib/dumphint
--- ghostscript-8.63/lib/dumphint.gs-executable 2009-06-10 17:47:31.189484085 +0100
+++ ghostscript-8.63/lib/dumphint 2009-06-10 17:47:31.191484839 +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 -- dumphint.ps "$1"
+exec "$gs" -q -dNODISPLAY $OPTIONS -- dumphint.ps "$1"
diff -up ghostscript-8.63/lib/eps2eps.gs-executable ghostscript-8.63/lib/eps2eps
--- ghostscript-8.63/lib/eps2eps.gs-executable 2009-06-10 17:47:31.193483738 +0100
+++ ghostscript-8.63/lib/eps2eps 2009-06-10 17:47:31.195484763 +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 "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
+exec "$gs" -q -sDEVICE=epswrite "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
diff -up ghostscript-8.63/lib/font2c.gs-executable ghostscript-8.63/lib/font2c
--- ghostscript-8.63/lib/font2c.gs-executable 2009-06-10 17:47:31.197483903 +0100
+++ ghostscript-8.63/lib/font2c 2009-06-10 17:47:31.199484647 +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.63/lib/gsbj.gs-executable ghostscript-8.63/lib/gsbj
--- ghostscript-8.63/lib/gsbj.gs-executable 2009-06-10 17:47:31.201483281 +0100
+++ ghostscript-8.63/lib/gsbj 2009-06-10 17:47:31.203484230 +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.63/lib/gsdj500.gs-executable ghostscript-8.63/lib/gsdj500
--- ghostscript-8.63/lib/gsdj500.gs-executable 2009-06-10 17:47:31.208484529 +0100
+++ ghostscript-8.63/lib/gsdj500 2009-06-10 17:47:31.210483970 +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.63/lib/gsdj.gs-executable ghostscript-8.63/lib/gsdj
--- ghostscript-8.63/lib/gsdj.gs-executable 2009-06-10 17:47:31.205483180 +0100
+++ ghostscript-8.63/lib/gsdj 2009-06-10 17:47:31.207483934 +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.63/lib/gslj.gs-executable ghostscript-8.63/lib/gslj
--- ghostscript-8.63/lib/gslj.gs-executable 2009-06-10 17:47:31.212483852 +0100
+++ ghostscript-8.63/lib/gslj 2009-06-10 17:47:31.214483814 +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.63/lib/gslp.gs-executable ghostscript-8.63/lib/gslp
--- ghostscript-8.63/lib/gslp.gs-executable 2009-06-10 17:47:31.216483876 +0100
+++ ghostscript-8.63/lib/gslp 2009-06-10 17:47:31.218484199 +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.63/lib/gsnd.gs-executable ghostscript-8.63/lib/gsnd
--- ghostscript-8.63/lib/gsnd.gs-executable 2009-06-10 17:47:31.220484607 +0100
+++ ghostscript-8.63/lib/gsnd 2009-06-10 17:47:31.222483963 +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.63/lib/pdf2dsc.gs-executable ghostscript-8.63/lib/pdf2dsc
--- ghostscript-8.63/lib/pdf2dsc.gs-executable 2009-06-10 17:47:31.224483589 +0100
+++ ghostscript-8.63/lib/pdf2dsc 2009-06-10 17:47:31.226484538 +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.63/lib/pdf2ps.gs-executable ghostscript-8.63/lib/pdf2ps
--- ghostscript-8.63/lib/pdf2ps.gs-executable 2009-06-10 17:47:31.228483618 +0100
+++ ghostscript-8.63/lib/pdf2ps 2009-06-10 17:47:31.230484001 +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.63/lib/pdfopt.gs-executable ghostscript-8.63/lib/pdfopt
--- ghostscript-8.63/lib/pdfopt.gs-executable 2009-06-10 17:47:31.232484099 +0100
+++ ghostscript-8.63/lib/pdfopt 2009-06-10 17:47:31.234484276 +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.63/lib/pf2afm.gs-executable ghostscript-8.63/lib/pf2afm
--- ghostscript-8.63/lib/pf2afm.gs-executable 2009-06-10 17:47:31.236483632 +0100
+++ ghostscript-8.63/lib/pf2afm 2009-06-10 17:47:31.238483689 +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.63/lib/pfbtopfa.gs-executable ghostscript-8.63/lib/pfbtopfa
--- ghostscript-8.63/lib/pfbtopfa.gs-executable 2009-06-10 17:47:31.240483907 +0100
+++ ghostscript-8.63/lib/pfbtopfa 2009-06-10 17:47:31.242484154 +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.63/lib/pphs.gs-executable ghostscript-8.63/lib/pphs
--- ghostscript-8.63/lib/pphs.gs-executable 2009-06-10 17:47:31.244484337 +0100
+++ ghostscript-8.63/lib/pphs 2009-06-10 17:47:31.246484364 +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.63/lib/printafm.gs-executable ghostscript-8.63/lib/printafm
--- ghostscript-8.63/lib/printafm.gs-executable 2009-06-10 17:47:31.248484141 +0100
+++ ghostscript-8.63/lib/printafm 2009-06-10 17:47:31.250485261 +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.63/lib/ps2epsi.gs-executable ghostscript-8.63/lib/ps2epsi
--- ghostscript-8.63/lib/ps2epsi.gs-executable 2009-06-10 17:47:31.252483864 +0100
+++ ghostscript-8.63/lib/ps2epsi 2009-06-10 17:47:31.254484749 +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
@@ -75,7 +74,7 @@ awk 'F==1 {
}
' U="$USERNAME$LOGNAME" F=1 - F=2 "${infile}" >"$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.63/lib/ps2pdfwr.gs-executable ghostscript-8.63/lib/ps2pdfwr
--- ghostscript-8.63/lib/ps2pdfwr.gs-executable 2009-06-10 17:47:31.256484129 +0100
+++ ghostscript-8.63/lib/ps2pdfwr 2009-06-10 17:47:31.258484387 +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 "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
+exec "$gs" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
diff -up ghostscript-8.63/lib/ps2ps.gs-executable ghostscript-8.63/lib/ps2ps
--- ghostscript-8.63/lib/ps2ps.gs-executable 2009-06-10 17:47:31.260483878 +0100
+++ ghostscript-8.63/lib/ps2ps 2009-06-10 17:47:31.262483424 +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 "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
+exec "$gs" -q -sDEVICE=pswrite "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
diff -up ghostscript-8.63/lib/wftopfa.gs-executable ghostscript-8.63/lib/wftopfa
--- ghostscript-8.63/lib/wftopfa.gs-executable 2009-06-10 17:47:31.264483887 +0100
+++ ghostscript-8.63/lib/wftopfa 2009-06-10 17:47:31.266484275 +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 "$@"
Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-10/ghostscript.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- ghostscript.spec 4 Jun 2009 12:51:00 -0000 1.181
+++ ghostscript.spec 10 Jun 2009 17:00:16 -0000 1.182
@@ -5,7 +5,7 @@ Summary: A PostScript(TM) interpreter an
Name: ghostscript
Version: %{gs_ver}
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2
URL: http://www.ghostscript.com/
@@ -26,6 +26,7 @@ Patch9: ghostscript-CVE-2009-0792.patch
Patch10: ghostscript-CVE-2009-0196.patch
Patch11: ghostscript-CVE-2008-6679.patch
Patch12: ghostscript-jbig2dec-nullderef.patch
+Patch13: ghostscript-gs-executable.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts
BuildRequires: libjpeg-devel, libXt-devel
@@ -125,6 +126,9 @@ rm -rf libpng zlib jpeg jasper
# Applied patch to fix NULL dereference in jbig2dec (bug #503991).
%patch12 -p1 -b .jbig2dec-nullderef
+# Fix scripts so they don't get broken on install (bug #502550).
+%patch13 -p1 -b .gs-executable
+
# Convert manual pages to UTF-8
from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -309,6 +313,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so
%changelog
+* Wed Jun 10 2009 Tim Waugh <twaugh at redhat.com> 8.63-8
+- Fix scripts so they don't get broken on install (bug #502550).
+
* Thu Jun 4 2009 Tim Waugh <twaugh at redhat.com> 8.63-7
- Applied patch to fix NULL dereference in jbig2dec (bug #503991).
More information about the fedora-extras-commits
mailing list