Merge branch 'f19' into f20

ghostscript.spec

@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -94,7 +94,7 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
 
 %prep
 %setup -q -n %{name}-%{gs_ver}
-rm -rf expat freetype icclib jasper jpeg lcms lcms2 libpng openjpeg zlib cups/libs
+rm -rf expat freetype icclib jasper jpeg jpegxr lcms lcms2 libpng openjpeg zlib cups/libs
 
 # Fix ijs-config not to have multilib conflicts (bug #192672)
 %patch1 -p1 -b .multilib
@@ -319,6 +319,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Wed Aug 28 2013 Tim Waugh <twaugh@redhat.com> 9.09-3
+- Remove jpegxr to ensure it isn't built (bug #1000387).
+
 * Thu Aug 22 2013 Tim Waugh <twaugh@redhat.com> 9.09-2
 - Fixed character set conversion issue in pdfwrite (bug #999927).