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

[Tim Waugh]

commit bf4041ceb4c3dd50ada251a448e9318412192d54
Merge: 6526222 0c1e753
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Aug 25 16:36:05 2010 +0100

    Merge branch 'f12' into f13

 ghostscript--P-.patch               | 1414 +++++++++++++++++++++++++++++++++++
 ghostscript-SEARCH_HERE_FIRST.patch |  246 ++++++-
 ghostscript.spec                    |   12 +-
 3 files changed, 1653 insertions(+), 19 deletions(-)
---
diff --cc ghostscript.spec
index b25ef9f,e06b52e..9636ff9
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -5,7 -5,7 +5,7 @@@ Summary: A PostScript interpreter and r
  Name: ghostscript
  Version: %{gs_ver}
  
- Release: 12%{?dist}
 -Release: 10%{?dist}
++Release: 13%{?dist}
  
  # Included CMap data is Redistributable, no modification permitted,
  # see http://bugzilla.redhat.com/487510
@@@ -176,10 -175,13 +177,13 @@@ rm -rf libpng zlib jpeg jaspe
  # (bug #599564).
  %patch22 -p1 -b .SEARCH_HERE_FIRST
  
+ # Use -P- and -dSAFER in scripts (bug #599564).
+ %patch23 -p1 -b .-P-
+ 
  # 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
  
@@@ -355,7 -365,12 +359,11 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libgs.so
  
  %changelog
- * Wed Aug 25 2010 Tim Waugh <twaugh at redhat.com> 8.71-9
 -* Wed Aug 25 2010 Tim Waugh <twaugh at redhat.com> 8.71-10
++* Wed Aug 25 2010 Tim Waugh <twaugh at redhat.com> 8.71-13
+ - Fix implementation of -P- (bug #599564).
+ - Use -P- and -dSAFER in scripts (bug #599564).
+ 
 -* Wed Aug 25 2010 Tim Waugh <twaugh at redhat.com> 8.71-9
++* Wed Aug 25 2010 Tim Waugh <twaugh at redhat.com> 8.71-12
  - Change SEARCH_HERE_FIRST default to make -P- default instead of -P
    (bug #599564).
  - Removed redundant gs-executable patch (bug #502550).