diff --git a/ghostscript-SEARCH_HERE_FIRST.patch b/ghostscript-SEARCH_HERE_FIRST.patch index 79335f3..9235bb1 100644 --- a/ghostscript-SEARCH_HERE_FIRST.patch +++ b/ghostscript-SEARCH_HERE_FIRST.patch @@ -1,6 +1,6 @@ diff -up ghostscript-8.71/base/bcwin32.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/bcwin32.mak --- ghostscript-8.71/base/bcwin32.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000 -+++ ghostscript-8.71/base/bcwin32.mak 2010-08-26 14:42:24.564965845 +0100 ++++ ghostscript-8.71/base/bcwin32.mak 2011-02-01 11:47:56.202759760 +0000 @@ -78,13 +78,10 @@ GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Ini # Define whether or not searching for initialization files should always @@ -19,7 +19,7 @@ diff -up ghostscript-8.71/base/bcwin32.mak.SEARCH_HERE_FIRST ghostscript-8.71/ba # Define the name of the interpreter initialization file. diff -up ghostscript-8.71/base/macos-mcp.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/macos-mcp.mak --- ghostscript-8.71/base/macos-mcp.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000 -+++ ghostscript-8.71/base/macos-mcp.mak 2010-08-26 14:42:24.565965206 +0100 ++++ ghostscript-8.71/base/macos-mcp.mak 2011-02-01 11:47:56.203759868 +0000 @@ -53,12 +53,9 @@ GS_DOCDIR=:doc # Define whether or not searching for initialization files should always @@ -37,7 +37,7 @@ diff -up ghostscript-8.71/base/macos-mcp.mak.SEARCH_HERE_FIRST ghostscript-8.71/ # (There is no reason to change this.) diff -up ghostscript-8.71/base/macosx.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/macosx.mak --- ghostscript-8.71/base/macosx.mak.SEARCH_HERE_FIRST 2008-10-02 20:33:22.000000000 +0100 -+++ ghostscript-8.71/base/macosx.mak 2010-08-26 14:42:24.567964998 +0100 ++++ ghostscript-8.71/base/macosx.mak 2011-02-01 11:47:56.204759975 +0000 @@ -78,12 +78,9 @@ GS_LIB_DEFAULT=$(gsdatadir)/Resource/Ini # Define whether or not searching for initialization files should always @@ -55,7 +55,7 @@ diff -up ghostscript-8.71/base/macosx.mak.SEARCH_HERE_FIRST ghostscript-8.71/bas # (There is no reason to change this.) diff -up ghostscript-8.71/base/Makefile.in.SEARCH_HERE_FIRST ghostscript-8.71/base/Makefile.in --- ghostscript-8.71/base/Makefile.in.SEARCH_HERE_FIRST 2009-12-18 07:04:10.000000000 +0000 -+++ ghostscript-8.71/base/Makefile.in 2010-08-26 14:42:24.568840684 +0100 ++++ ghostscript-8.71/base/Makefile.in 2011-02-01 11:47:56.209760511 +0000 @@ -96,12 +96,9 @@ GS_CACHE_DIR="~/.ghostscript/cache/" # Define whether or not searching for initialization files should always @@ -73,7 +73,7 @@ diff -up ghostscript-8.71/base/Makefile.in.SEARCH_HERE_FIRST ghostscript-8.71/ba # (There is no reason to change this.) diff -up ghostscript-8.71/base/msvclib.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/msvclib.mak --- ghostscript-8.71/base/msvclib.mak.SEARCH_HERE_FIRST 2010-01-07 10:53:36.000000000 +0000 -+++ ghostscript-8.71/base/msvclib.mak 2010-08-26 14:42:24.570840275 +0100 ++++ ghostscript-8.71/base/msvclib.mak 2011-02-01 11:47:56.210760618 +0000 @@ -49,13 +49,10 @@ GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Ini # Define whether or not searching for initialization files should always @@ -92,7 +92,7 @@ diff -up ghostscript-8.71/base/msvclib.mak.SEARCH_HERE_FIRST ghostscript-8.71/ba # Define the name of the interpreter initialization file. diff -up ghostscript-8.71/base/openvms.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/openvms.mak --- ghostscript-8.71/base/openvms.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000 -+++ ghostscript-8.71/base/openvms.mak 2010-08-26 14:42:24.571840163 +0100 ++++ ghostscript-8.71/base/openvms.mak 2011-02-01 11:47:56.211760726 +0000 @@ -68,12 +68,9 @@ GS_LIB_DEFAULT=GS_ROOT:[RESOURCE.INIT],G # Define whether or not searching for initialization files should always @@ -110,7 +110,7 @@ diff -up ghostscript-8.71/base/openvms.mak.SEARCH_HERE_FIRST ghostscript-8.71/ba # (There is no reason to change this.) diff -up ghostscript-8.71/base/openvms.mmk.SEARCH_HERE_FIRST ghostscript-8.71/base/openvms.mmk --- ghostscript-8.71/base/openvms.mmk.SEARCH_HERE_FIRST 2009-01-08 09:17:18.000000000 +0000 -+++ ghostscript-8.71/base/openvms.mmk 2010-08-26 14:42:24.572840641 +0100 ++++ ghostscript-8.71/base/openvms.mmk 2011-02-01 11:47:56.213760940 +0000 @@ -73,12 +73,9 @@ GS_LIB_DEFAULT=GS_LIB # Define whether or not searching for initialization files should always @@ -128,7 +128,7 @@ diff -up ghostscript-8.71/base/openvms.mmk.SEARCH_HERE_FIRST ghostscript-8.71/ba # (There is no reason to change this.) diff -up ghostscript-8.71/base/ugcclib.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/ugcclib.mak --- ghostscript-8.71/base/ugcclib.mak.SEARCH_HERE_FIRST 2008-11-05 20:41:22.000000000 +0000 -+++ ghostscript-8.71/base/ugcclib.mak 2010-08-26 14:42:24.573840607 +0100 ++++ ghostscript-8.71/base/ugcclib.mak 2011-02-01 11:47:56.214761048 +0000 @@ -30,7 +30,7 @@ gsdir = /usr/local/share/ghostscript gsdatadir = $(gsdir)/$(GS_DOT_VERSION) GS_DOCDIR=$(gsdatadir)/doc @@ -140,7 +140,7 @@ diff -up ghostscript-8.71/base/ugcclib.mak.SEARCH_HERE_FIRST ghostscript-8.71/ba #GENOPT=-DDEBUG diff -up ghostscript-8.71/base/unixansi.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/unixansi.mak --- ghostscript-8.71/base/unixansi.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000 -+++ ghostscript-8.71/base/unixansi.mak 2010-08-26 14:42:24.575840435 +0100 ++++ ghostscript-8.71/base/unixansi.mak 2011-02-01 11:47:56.215761155 +0000 @@ -73,12 +73,9 @@ GS_LIB_DEFAULT=$(gsdatadir)/Resource/Ini # Define whether or not searching for initialization files should always @@ -158,7 +158,7 @@ diff -up ghostscript-8.71/base/unixansi.mak.SEARCH_HERE_FIRST ghostscript-8.71/b # (There is no reason to change this.) diff -up ghostscript-8.71/base/unix-gcc.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/unix-gcc.mak --- ghostscript-8.71/base/unix-gcc.mak.SEARCH_HERE_FIRST 2009-11-11 15:50:28.000000000 +0000 -+++ ghostscript-8.71/base/unix-gcc.mak 2010-08-26 14:42:24.576840199 +0100 ++++ ghostscript-8.71/base/unix-gcc.mak 2011-02-01 11:47:56.216761262 +0000 @@ -77,12 +77,9 @@ GS_LIB_DEFAULT=$(gsdatadir)/Resource/Ini # Define whether or not searching for initialization files should always @@ -176,7 +176,7 @@ diff -up ghostscript-8.71/base/unix-gcc.mak.SEARCH_HERE_FIRST ghostscript-8.71/b # (There is no reason to change this.) diff -up ghostscript-8.71/base/watclib.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/watclib.mak --- ghostscript-8.71/base/watclib.mak.SEARCH_HERE_FIRST 2009-01-08 09:17:18.000000000 +0000 -+++ ghostscript-8.71/base/watclib.mak 2010-08-26 14:42:24.577840314 +0100 ++++ ghostscript-8.71/base/watclib.mak 2011-02-01 11:47:56.217761369 +0000 @@ -20,7 +20,7 @@ AROOTDIR=c:/gs GSROOTDIR=$(AROOTDIR)/gs$(GS_DOT_VERSION) GS_DOCDIR=$(GSROOTDIR)/doc @@ -188,7 +188,7 @@ diff -up ghostscript-8.71/base/watclib.mak.SEARCH_HERE_FIRST ghostscript-8.71/ba !ifndef DEBUG diff -up ghostscript-8.71/base/watcw32.mak.SEARCH_HERE_FIRST ghostscript-8.71/base/watcw32.mak --- ghostscript-8.71/base/watcw32.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000 -+++ ghostscript-8.71/base/watcw32.mak 2010-08-26 14:42:24.578840893 +0100 ++++ ghostscript-8.71/base/watcw32.mak 2011-02-01 11:47:56.218761477 +0000 @@ -54,11 +54,8 @@ GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Ini # Define whether or not searching for initialization files should always # look in the current directory first. This leads to well-known security @@ -204,7 +204,7 @@ diff -up ghostscript-8.71/base/watcw32.mak.SEARCH_HERE_FIRST ghostscript-8.71/ba # (There is no reason to change this.) diff -up ghostscript-8.71/doc/Use.htm.SEARCH_HERE_FIRST ghostscript-8.71/doc/Use.htm --- ghostscript-8.71/doc/Use.htm.SEARCH_HERE_FIRST 2010-02-10 18:17:48.000000000 +0000 -+++ ghostscript-8.71/doc/Use.htm 2010-08-26 14:42:24.583840122 +0100 ++++ ghostscript-8.71/doc/Use.htm 2011-02-01 11:47:56.222761906 +0000 @@ -823,8 +823,8 @@ file name specifies an absolute path. using the name given. Otherwise it tries directories in this order: @@ -253,7 +253,7 @@ diff -up ghostscript-8.71/doc/Use.htm.SEARCH_HERE_FIRST ghostscript-8.71/doc/Use

Setting parameters

diff -up ghostscript-8.71/man/gs.1.SEARCH_HERE_FIRST ghostscript-8.71/man/gs.1 --- ghostscript-8.71/man/gs.1.SEARCH_HERE_FIRST 2010-02-10 18:17:48.000000000 +0000 -+++ ghostscript-8.71/man/gs.1 2010-08-26 14:42:24.586965259 +0100 ++++ ghostscript-8.71/man/gs.1 2011-02-01 11:47:56.229762657 +0000 @@ -208,6 +208,12 @@ whereas \fB\-sname=35\fR is equivalent t .br /name (35) def @@ -269,7 +269,7 @@ diff -up ghostscript-8.71/man/gs.1.SEARCH_HERE_FIRST ghostscript-8.71/man/gs.1 equivalent of \fB\-dQUIET\fR. diff -up ghostscript-8.71/psi/msvc32.mak.SEARCH_HERE_FIRST ghostscript-8.71/psi/msvc32.mak --- ghostscript-8.71/psi/msvc32.mak.SEARCH_HERE_FIRST 2010-02-02 18:14:37.000000000 +0000 -+++ ghostscript-8.71/psi/msvc32.mak 2010-08-26 14:42:24.588840343 +0100 ++++ ghostscript-8.71/psi/msvc32.mak 2011-02-01 11:47:56.230762764 +0000 @@ -100,13 +100,10 @@ GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Ini # Define whether or not searching for initialization files should always @@ -288,7 +288,7 @@ diff -up ghostscript-8.71/psi/msvc32.mak.SEARCH_HERE_FIRST ghostscript-8.71/psi/ # Define the name of the interpreter initialization file. diff -up ghostscript-8.71/psi/os2.mak.SEARCH_HERE_FIRST ghostscript-8.71/psi/os2.mak --- ghostscript-8.71/psi/os2.mak.SEARCH_HERE_FIRST 2009-11-05 22:24:30.000000000 +0000 -+++ ghostscript-8.71/psi/os2.mak 2010-08-26 14:42:24.590840867 +0100 ++++ ghostscript-8.71/psi/os2.mak 2011-02-01 11:47:56.232762979 +0000 @@ -54,12 +54,9 @@ GS_LIB_DEFAULT=$(GSROOTDIR)/Resource/Ini # Define whether or not searching for initialization files should always @@ -306,7 +306,7 @@ diff -up ghostscript-8.71/psi/os2.mak.SEARCH_HERE_FIRST ghostscript-8.71/psi/os2 # (There is no reason to change this.) diff -up ghostscript-8.71/psi/zfile.c.SEARCH_HERE_FIRST ghostscript-8.71/psi/zfile.c --- ghostscript-8.71/psi/zfile.c.SEARCH_HERE_FIRST 2009-10-04 13:42:07.000000000 +0100 -+++ ghostscript-8.71/psi/zfile.c 2010-08-26 14:42:24.593842556 +0100 ++++ ghostscript-8.71/psi/zfile.c 2011-02-01 11:47:56.234763193 +0000 @@ -486,8 +486,13 @@ zstatus(i_ctx_t *i_ctx_p) struct stat fstat; int code = parse_file_name(op, &pname, i_ctx_p->LockFilePermissions); @@ -532,9 +532,9 @@ diff -up ghostscript-8.71/psi/zfile.c.SEARCH_HERE_FIRST ghostscript-8.71/psi/zfi return_error(e_undefinedfilename); } diff -up ghostscript-8.71/Resource/Init/gs_fonts.ps.SEARCH_HERE_FIRST ghostscript-8.71/Resource/Init/gs_fonts.ps ---- ghostscript-8.71/Resource/Init/gs_fonts.ps.SEARCH_HERE_FIRST 2008-08-08 05:22:38.000000000 +0100 -+++ ghostscript-8.71/Resource/Init/gs_fonts.ps 2010-08-26 14:42:24.606840016 +0100 -@@ -939,7 +939,7 @@ $error /SubstituteFont { } put +--- ghostscript-8.71/Resource/Init/gs_fonts.ps.SEARCH_HERE_FIRST 2011-02-01 11:47:56.111749998 +0000 ++++ ghostscript-8.71/Resource/Init/gs_fonts.ps 2011-02-01 11:47:56.236763408 +0000 +@@ -948,7 +948,7 @@ $error /SubstituteFont { } put if } { % Font file name @@ -543,7 +543,7 @@ diff -up ghostscript-8.71/Resource/Init/gs_fonts.ps.SEARCH_HERE_FIRST ghostscrip } ifelse } -@@ -982,39 +982,47 @@ $error /SubstituteFont { } put +@@ -991,39 +991,47 @@ $error /SubstituteFont { } put /.genericrfn where { pop pop dup .fonttempstring /FontResourceDir getsystemparam .genericrfn @@ -609,7 +609,7 @@ diff -up ghostscript-8.71/Resource/Init/gs_fonts.ps.SEARCH_HERE_FIRST ghostscrip 2 index (r) file diff -up ghostscript-8.71/Resource/Init/gs_res.ps.SEARCH_HERE_FIRST ghostscript-8.71/Resource/Init/gs_res.ps --- ghostscript-8.71/Resource/Init/gs_res.ps.SEARCH_HERE_FIRST 2010-01-31 20:30:13.000000000 +0000 -+++ ghostscript-8.71/Resource/Init/gs_res.ps 2010-08-26 14:43:57.159839992 +0100 ++++ ghostscript-8.71/Resource/Init/gs_res.ps 2011-02-01 11:47:56.238763622 +0000 @@ -287,7 +287,8 @@ systemdict begin } { (Resource) search { @@ -692,7 +692,7 @@ diff -up ghostscript-8.71/Resource/Init/gs_res.ps.SEARCH_HERE_FIRST ghostscript- diff -up ghostscript-8.71/toolbin/msvcxml.bat.SEARCH_HERE_FIRST ghostscript-8.71/toolbin/msvcxml.bat --- ghostscript-8.71/toolbin/msvcxml.bat.SEARCH_HERE_FIRST 2009-01-26 17:16:47.000000000 +0000 -+++ ghostscript-8.71/toolbin/msvcxml.bat 2010-08-26 14:42:24.619840359 +0100 ++++ ghostscript-8.71/toolbin/msvcxml.bat 2011-02-01 11:47:56.241763944 +0000 @@ -1428,7 +1428,7 @@ echo ^ echo ^ diff --git a/ghostscript.spec b/ghostscript.spec index 4fbf3d4..9620fe0 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer Name: ghostscript Version: %{gs_ver} -Release: 22%{?dist} +Release: 23%{?dist} # Included CMap data is Redistributable, no modification permitted, # see http://bugzilla.redhat.com/487510 @@ -184,7 +184,7 @@ rm -rf libpng zlib jpeg jasper # Change SEARCH_HERE_FIRST default to make -P- default instead of -P # (bug #599564). -%patch22 -p1 -b .SEARCH_HERE_FIRST +%patch22 -p1 # Use -P- and -dSAFER in scripts (bug #599564). %patch23 -p1 -b .-P- @@ -394,6 +394,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog +* Tue Feb 1 2011 Tim Waugh 8.71-23 +- Don't ship backup files for SEARCH_HERE_FIRST patch. + * Fri Nov 26 2010 Tim Waugh 8.71-22 - Fixed more summaries ending with ".".