[ghostscript/f19: 2/2] Merge branch 'f18' into f19

[Tim Waugh]

commit 98998b885f95f6ab1d38eec052af7123998c01b7
Merge: a0426f4 9c8808c
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu May 16 09:31:25 2013 +0100

    Merge branch 'f18' into f19

 ghostscript-pdfwrite-segfault.patch |   51 +++++++++++++++++++++++++++++++++++
 ghostscript.spec                    |    9 +++++-
 2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --cc ghostscript.spec
index 776a0f9,89d0768..854ea47
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -5,7 -5,7 +5,7 @@@ Summary: A PostScript interpreter and r
  Name: ghostscript
  Version: %{gs_ver}
  
- Release: 3%{?dist}
 -Release: 5%{?dist}
++Release: 4%{?dist}
  
  # Included CMap data is Redistributable, no modification permitted,
  # see http://bugzilla.redhat.com/487510
@@@ -19,13 -19,14 +19,14 @@@ Source4: cidfma
  Patch1: ghostscript-multilib.patch
  Patch2: ghostscript-scripts.patch
  Patch3: ghostscript-noopt.patch
 -Patch4: ghostscript-ijs-automake-ver.patch
 -Patch5: ghostscript-runlibfileifexists.patch
 -Patch6: ghostscript-icc-missing-check.patch
 -Patch10: ghostscript-cups-filters.patch
 -Patch27: ghostscript-Fontmap.local.patch
 -Patch28: ghostscript-iccprofiles-initdir.patch
 -Patch29: ghostscript-gdevcups-debug-uninit.patch
 -Patch30: ghostscript-pdfwrite-segfault.patch
 +Patch4: ghostscript-runlibfileifexists.patch
 +Patch5: ghostscript-icc-missing-check.patch
 +Patch6: ghostscript-cups-filters.patch
 +Patch7: ghostscript-Fontmap.local.patch
 +Patch8: ghostscript-iccprofiles-initdir.patch
 +Patch9: ghostscript-gdevcups-debug-uninit.patch
 +Patch10: ghostscript-gs_sprintf.patch
++Patch11: ghostscript-pdfwrite-segfault.patch
  
  Requires: urw-fonts >= 1.1, ghostscript-fonts
  Requires: poppler-data
@@@ -127,17 -132,17 +128,20 @@@ rm -rf expat freetype icclib jasper jpe
  # ghostscript-8.15.4-3 (bug #610301).
  # Note: don't use -b here to avoid the backup file ending up in the
  # package manifest.
 -%patch27 -p1
 +%patch7 -p1
  
  # Don't assume %%rom%% device is available for initial ICC profile dir.
 -%patch28 -p1 -b .iccprofiles-initdir
 +%patch8 -p1 -b .iccprofiles-initdir
  
  # gdevcups: don't use uninitialized variables in debugging output.
 -%patch29 -p1 -b .gdevcups-debug-uninit
 +%patch9 -p1 -b .gdevcups-debug-uninit
 +
 +# Back-ported locale fix (bug #961149).
 +%patch10 -p1 -b .gs_sprintf
  
+ # Upstream patch to fix pdfwrite segfault (bug #962120).
 -%patch30 -p1 -b .pdfwrite-segfault
++%patch11 -p1 -b .pdfwrite-segfault
+ 
  # Convert manual pages to UTF-8
  from8859_1() {
          iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@@ -334,9 -339,9 +338,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libgs.so
  
  %changelog
 -* Thu May 16 2013 Tim Waugh <twaugh at redhat.com> 9.06-5
++* Thu May 16 2013 Tim Waugh <twaugh at redhat.com> 9.07-4
+ - Upstream patch to fix pdfwrite segfault (bug #962120).
+ 
 +* Thu May  9 2013 Tim Waugh <twaugh at redhat.com> - 9.07-3
 +- Back-ported locale fix (bug #961149).
 +
  * Thu Apr 25 2013 Tim Waugh <twaugh at redhat.com>
  - Unowned directories (bug #902525).