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

[Tim Waugh]

commit d315dcd79a6420a98ed8afedca27080f58362216
Merge: 1944204 1e7576b
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Oct 1 17:26:37 2010 +0100

    Merge branch 'f14'

 ghostscript-ps2epsi-cr.patch |   14 --------------
 ghostscript.spec             |    9 ++++-----
 2 files changed, 4 insertions(+), 19 deletions(-)
---
diff --cc ghostscript.spec
index 7049437,e0e7684..7974be1
--- 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: 18%{?dist}
++Release: 4%{?dist}
  
  # Included CMap data is Redistributable, no modification permitted,
  # see http://bugzilla.redhat.com/487510
@@@ -23,12 -24,25 +23,11 @@@ 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-iccprofiles-initdir.patch
- Patch29: ghostscript-ps2epsi-cr.patch
  
  Requires: urw-fonts >= 1.1, ghostscript-fonts
  BuildRequires: xz
@@@ -139,12 -204,6 +138,9 @@@ 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).
- %patch29 -p1 -b .ps2epsi-cr
- 
  # Convert manual pages to UTF-8
  from8859_1() {
          iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@@ -327,7 -385,10 +323,10 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/libgs.so
  
  %changelog
 -* Fri Oct  1 2010 Tim Waugh <twaugh at redhat.com> 8.71-18
++* Fri Oct  1 2010 Tim Waugh <twaugh at redhat.com> 9.00-4
+ - Reverted incorrect change introduced to fix bug #635786.
+ 
 -* 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).