[ghostscript/f13/master: 3/3] Merge branch 'f12' into f13

[Tim Waugh]

commit 6526222ba40091a5b8aa444fc21dfb8f3b926ab3
Merge: 56ff80c 5a5e484
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Aug 25 14:24:12 2010 +0100

    Merge branch 'f12' into f13

 ghostscript-SEARCH_HERE_FIRST.patch |  318 ++++++++++++++++++++++++++++++
 ghostscript-gs-executable.patch     |  361 -----------------------------------
 ghostscript.spec                    |   16 +-
 3 files changed, 329 insertions(+), 366 deletions(-)
---
diff --cc ghostscript.spec
index 86fab74,a8406f8..b25ef9f
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -5,7 -5,7 +5,7 @@@ Summary: A PostScript interpreter and r
  Name: ghostscript
  Version: %{gs_ver}
  
- Release: 11%{?dist}
 -Release: 9%{?dist}
++Release: 12%{?dist}
  
  # Included CMap data is Redistributable, no modification permitted,
  # see http://bugzilla.redhat.com/487510
@@@ -24,10 -24,9 +24,9 @@@ Patch5: ghostscript-runlibfileifexists.
  Patch6: ghostscript-system-jasper.patch
  Patch7: ghostscript-pksmraw.patch
  Patch8: ghostscript-jbig2dec-nullderef.patch
- Patch9: ghostscript-gs-executable.patch
 -Patch10: ghostscript-CVE-2009-4270.patch
 -Patch11: ghostscript-vsnprintf.patch
 -Patch12: ghostscript-cups-filters.patch
 +Patch10: ghostscript-cups-filters.patch
 +Patch11: ghostscript-CVE-2009-4270.patch
 +Patch12: ghostscript-vsnprintf.patch
  Patch13: ghostscript-pdftoraster-exit.patch
  Patch14: ghostscript-ldflags.patch
  Patch15: ghostscript-pdf2dsc.patch
@@@ -135,17 -133,14 +135,14 @@@ rm -rf libpng zlib jpeg jaspe
  # 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
- 
 +# Install CUPS filter convs files in the correct place.
 +%patch10 -p1 -b .cups-filters
 +
  # Fix debugging output from gdevcups (bug #540760).
 -%patch10 -p1 -b .CVE-2009-4270
 +%patch11 -p1 -b .CVE-2009-4270
  
  # Harden ghostscript's debugging output functions (bug #540760).
 -%patch11 -p1 -b .vsnprintf
 -
 -# Install CUPS filter convs files in the correct place.
 -%patch12 -p1 -b .cups-filters
 +%patch12 -p1 -b .vsnprintf
  
  # Fixed pdftoraster so that it waits for its sub-process to exit.
  %patch13 -p1 -b .pdftoraster-exit
@@@ -175,10 -170,14 +172,14 @@@
  # Avoid another NULL pointer dereference in jbig2 code (bug #621569).
  %patch21 -p1 -b .jbig2-image-refcount
  
+ # Change SEARCH_HERE_FIRST default to make -P- default instead of -P
+ # (bug #599564).
+ %patch22 -p1 -b .SEARCH_HERE_FIRST
+ 
  # Convert manual pages to UTF-8
  from8859_1() {
 -	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
 -	mv "${1}_" "$1"
 +        iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
 +        mv "${1}_" "$1"
  }
  for i in man/de/*.1; do from8859_1 "$i"; done
  
@@@ -354,10 -361,16 +355,15 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libgs.so
  
  %changelog
+ * Wed Aug 25 2010 Tim Waugh <twaugh at redhat.com> 8.71-9
+ - Change SEARCH_HERE_FIRST default to make -P- default instead of -P
+   (bug #599564).
+ - Removed redundant gs-executable patch (bug #502550).
+ 
 -* Thu Aug  5 2010 Tim Waugh <twaugh at redhat.com> 8.71-8
 +* Thu Aug  5 2010 Tim Waugh <twaugh at redhat.com> 8.71-11
  - Avoid another NULL pointer dereference in jbig2 code (bug #621569).
  
 -* Fri Jul 16 2010 Tim Waugh <twaugh at redhat.com> 8.71-7
 +* Fri Jul 16 2010 Tim Waugh <twaugh at redhat.com> 8.71-10
  - Applied patch to fix CVE-2010-1628 (memory corruption at PS stack
    overflow, bug #592492).