Merge branch 'f18' into f19

This commit is contained in:
Tim Waugh 2013-08-28 13:57:47 +01:00
commit c542db81c4

View File

@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
Name: ghostscript
Version: %{gs_ver}
Release: 13%{?dist}
Release: 14%{?dist}
# Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510
@ -110,7 +110,7 @@ CUPS filter and conversion rules for interpreting PostScript and PDF.
%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
@ -365,6 +365,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so
%changelog
* Wed Aug 28 2013 Tim Waugh <twaugh@redhat.com> 9.07-14
- Remove jpegxr to ensure it isn't built (bug #1000387).
* Thu Aug 22 2013 Tim Waugh <twaugh@redhat.com> 9.07-13
- Fixed character set conversion issue in pdfwrite (bug #999927).