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

[Tim Waugh]

commit 3f91350de46ec2023a582abceaab64bb539d7e2e
Merge: bf4041c c755f33
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 26 15:24:30 2010 +0100

    Merge branch 'f12' into f13

 ghostscript-SEARCH_HERE_FIRST.patch |  216 +++++++++++++++++++++++++++++++----
 ghostscript-epstopdf-failure.patch  |   50 ++++++++
 ghostscript.spec                    |   10 ++-
 3 files changed, 254 insertions(+), 22 deletions(-)
---
diff --cc ghostscript.spec
index 9636ff9,867caf0..720a75f
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -5,7 -5,7 +5,7 @@@ Summary: A PostScript interpreter and r
  Name: ghostscript
  Version: %{gs_ver}
  
- Release: 13%{?dist}
 -Release: 11%{?dist}
++Release: 14%{?dist}
  
  # Included CMap data is Redistributable, no modification permitted,
  # see http://bugzilla.redhat.com/487510
@@@ -180,10 -179,13 +181,13 @@@ rm -rf libpng zlib jpeg jaspe
  # Use -P- and -dSAFER in scripts (bug #599564).
  %patch23 -p1 -b .-P-
  
+ # Avoid epstopdf failure using upstream patch (bug #627390).
+ %patch24 -p1 -b .epstopdf-failure
+ 
  # 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
  
@@@ -359,7 -369,12 +363,11 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libgs.so
  
  %changelog
 -* Thu Aug 26 2010 Tim Waugh <twaugh at redhat.com> 8.71-11
++* Thu Aug 26 2010 Tim Waugh <twaugh at redhat.com> 8.71-14
+ - Avoid epstopdf failure using upstream patch (bug #627390).
+ - More upstream fixes for bug #599564.
+ 
 -* 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).