[ghostscript: 5/5] Merge branch 'f14'

[Tim Waugh]

commit 194420449ef3872c2d6a415aab79ee9d12fe3ff6
Merge: 4783568 5a1f2e8
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Sep 30 17:23:54 2010 +0100

    Merge branch 'f14'

 ghostscript-ps2epsi-cr.patch |   14 ++++++++++++++
 ghostscript.spec             |   14 ++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --cc ghostscript.spec
index 0ecd917,daba348..7049437
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@@ -5,7 -5,7 +5,7 @@@ Summary: A PostScript interpreter and r
  Name: ghostscript
  Version: %{gs_ver}
  
- Release: 2%{?dist}
 -Release: 17%{?dist}
++Release: 3%{?dist}
  
  # Included CMap data is Redistributable, no modification permitted,
  # see http://bugzilla.redhat.com/487510
@@@ -23,11 -24,26 +23,12 @@@ Patch5: ghostscript-runlibfileifexists.
  Patch6: ghostscript-system-jasper.patch
  Patch7: ghostscript-pksmraw.patch
  Patch8: ghostscript-jbig2dec-nullderef.patch
 -Patch9: ghostscript-iname-segfault.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
 -Patch16: ghostscript-cups-realloc-color-depth.patch
 -Patch17: ghostscript-tif-fail-close.patch
 -Patch18: ghostscript-tiff-default-strip-size.patch
 -Patch19: ghostscript-tiff-fixes.patch
 -Patch20: ghostscript-CVE-2010-1628.patch
  Patch21: ghostscript-jbig2-image-refcount.patch
 -Patch22: ghostscript-SEARCH_HERE_FIRST.patch
 -Patch23: ghostscript--P-.patch
 -Patch24: ghostscript-epstopdf-failure.patch
 -Patch25: ghostscript-bbox-close.patch
 -Patch26: ghostscript-gdevcups-ripcache.patch
  Patch27: ghostscript-Fontmap.local.patch
 -Patch28: ghostscript-ps2epsi-cr.patch
 +Patch28: ghostscript-iccprofiles-initdir.patch
++Patch29: ghostscript-ps2epsi-cr.patch
  
  Requires: urw-fonts >= 1.1, ghostscript-fonts
  BuildRequires: xz
@@@ -138,9 -205,9 +139,12 @@@ rm -rf libpng zlib jpeg jaspe
  # package manifest.
  %patch27 -p1
  
 +# Don't assume %rom% device is available for initial ICC profile dir.
 +%patch28 -p1 -b .iccprofiles-initdir
 +
+ # Don't use carriage return in ps2epsi output (bug #635786).
 -%patch28 -p1 -b .ps2epsi-cr
++%patch29 -p1 -b .ps2epsi-cr
+ 
  # Convert manual pages to UTF-8
  from8859_1() {
          iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@@ -321,16 -389,13 +327,20 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libgs.so
  
  %changelog
 -* Thu Sep 30 2010 Tim Waugh <twaugh at redhat.com> 8.71-17
++* Thu Sep 30 2010 Tim Waugh <twaugh at redhat.com> 9.00-3
+ - Don't use carriage return in ps2epsi output (bug #635786).
+ - Include more documentation (bug #634354).
+ 
 -* Wed Sep 29 2010 jkeating - 8.71-16.1
 +* Wed Sep 29 2010 jkeating - 9.00-2
  - Rebuilt for gcc bug 634757
  
 +* Thu Sep 23 2010 Tim Waugh <twaugh at redhat.com> 9.00-1
 +- Updated to 9.00.  No longer need -P-, CVE-2009-4270, CVE-2010-1628,
 +  SEARCH_HERE_FIRST, bbox-close, cups-realloc-color-depth,
 +  epstopdf-failure, fPIC, gdevcups-ripcache, iname-segfault, ldfalgs,
 +  pdf2dsc, pdftoraster-exit, tif-fail-close, tiff-default-strip-size,
 +  or tiff-fixes patches.
 +
  * Mon Sep 13 2010 Tim Waugh <twaugh at redhat.com> 8.71-16
  - Pulled in gs_fonts.ps modification for .runlibfileifexists from
    OpenSUSE package (bug #610301).