From 4a93f4fa871b86ab1d0388ade459dc743be9cfd9 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 22 Jan 2010 16:09:05 +0000 Subject: [PATCH] - New ghostscript-cups sub-package for some additional filters: pdftoraster; pstopxl. CUPS package still owns pstoraster for now. --- ghostscript-cups-filters.patch | 17 +++++++++++++++++ ghostscript.spec | 27 ++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 ghostscript-cups-filters.patch diff --git a/ghostscript-cups-filters.patch b/ghostscript-cups-filters.patch new file mode 100644 index 0000000..ea6565d --- /dev/null +++ b/ghostscript-cups-filters.patch @@ -0,0 +1,17 @@ +diff -up ghostscript-8.70/cups/cups.mak.cups-filters ghostscript-8.70/cups/cups.mak +--- ghostscript-8.70/cups/cups.mak.cups-filters 2009-10-15 12:42:27.531402610 +0100 ++++ ghostscript-8.70/cups/cups.mak 2009-10-15 12:44:14.835402533 +0100 +@@ -63,10 +63,10 @@ install-cups: cups + $(INSTALL_PROGRAM) $(PDFTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter; \ + fi + $(INSTALL_PROGRAM) cups/pstopxl $(DESTDIR)$(CUPSSERVERBIN)/filter +- -mkdir -p $(DESTDIR)$(CUPSSERVERROOT) +- $(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSSERVERROOT) ++ -mkdir -p $(DESTDIR)$(CUPSDATA)/mime ++ $(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSDATA)/mime + if [ "$(CUPSPDFTORASTER)" = "1" ]; then \ +- $(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSSERVERROOT); \ ++ $(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSDATA)/mime; \ + fi + -mkdir -p $(DESTDIR)$(CUPSDATA)/model + $(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model diff --git a/ghostscript.spec b/ghostscript.spec index fcf8f37..e20cbfc 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer. Name: ghostscript Version: %{gs_ver} -Release: 3%{?dist} +Release: 4%{?dist} # Included CMap data is Redistributable, no modification permitted, # see http://bugzilla.redhat.com/487510 @@ -28,6 +28,7 @@ Patch9: ghostscript-gs-executable.patch Patch10: ghostscript-CVE-2009-4270.patch Patch11: ghostscript-vsnprintf.patch Patch12: ghostscript-gdevcups-y-axis.patch +Patch13: ghostscript-cups-filters.patch Requires: urw-fonts >= 1.1, ghostscript-fonts BuildRequires: xz @@ -88,6 +89,15 @@ Group: Applications/Publishing %description gtk A GTK-enabled version of Ghostscript, called 'gsx'. +%package cups +Summary: CUPS filter for interpreting PostScript and PDF +Requires: %{name} = %{version}-%{release} +Requires: cups +Group: System Environment/Daemons + +%description cups +CUPS filter and conversion rules for interpreting PostScript and PDF. + %prep %setup -q -n %{name}-%{gs_ver} rm -rf libpng zlib jpeg jasper @@ -128,6 +138,9 @@ rm -rf libpng zlib jpeg jasper # revision 10625. %patch12 -p1 -b .gdevcups-y-axis +# Install CUPS filter convs files in the correct place. +%patch13 -p1 -b .cups-filters + # Convert manual pages to UTF-8 from8859_1() { iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" @@ -297,6 +310,14 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %{_bindir}/gsx +%files cups +%defattr(-,root,root) +%{_datadir}/cups/model/pxl* +%{_datadir}/cups/mime/*.convs +# This really is /usr/lib, not _libdir -- it's more of a libexec usage +# but upstream CUPS won't use libexec. +/usr/lib/cups/filter/* + %files devel %defattr(-,root,root) %dir %{_includedir}/ghostscript @@ -309,6 +330,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog +* Fri Jan 22 2010 Tim Waugh 8.70-4 +- New ghostscript-cups sub-package for some additional filters: + pdftoraster; pstopxl. CUPS package still owns pstoraster for now. + * Thu Jan 21 2010 Tim Waugh 8.70-3 - Fixed gdevcups duplex output (bug #541604) by backporting upstream revision 10625.