Merge branch 'f13' into f14

ghostscript.spec

@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 20%{?dist}
+Release: 21%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -44,7 +44,6 @@ Patch25: ghostscript-bbox-close.patch
 Patch26: ghostscript-gdevcups-ripcache.patch
 Patch27: ghostscript-Fontmap.local.patch
 Patch28: ghostscript-gdevcups-debug-uninit.patch
-Patch29: ghostscript-gdevcups-segfaults.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: xz
@@ -209,9 +208,6 @@ rm -rf libpng zlib jpeg jasper
 # gdevcups: don't use uninitialized variables in debugging output.
 %patch28 -p1 -b .gdevcups-debug-uninit
 
-# Apply some fixes from upstream to avoid gdevcups segfaults (bug #639593).
-%patch29 -p1 -b .gdevcups-segfaults
-
 # Convert manual pages to UTF-8
 from8859_1() {
         iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -398,6 +394,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Thu Nov 25 2010 Tim Waugh <twaugh@redhat.com> 8.71-21
+- Reverted gdevcups-segfaults patch from bug #639593 as it causes
+  artifacts in multi-page PDF documents (bug #655403).  Even picking
+  just svn revision 11149 causes this problem.
+
 * Thu Oct 21 2010 Tim Waugh <twaugh@redhat.com> 8.71-20
 - Own more directories (bug #645075).