- New cups sub-package for pstoraster/pdftoraster/pstopxl.

This commit is contained in:
Tim Waugh 2009-10-15 12:52:20 +00:00
parent 15621b2b5a
commit 01bff26309
2 changed files with 42 additions and 9 deletions

View File

@ -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

View File

@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer.
Name: ghostscript
Version: %{gs_ver}
Release: 1%{?dist}
Release: 2%{?dist}
# Included CMap data is Redistributable, no modification permitted,
# see http://bugzilla.redhat.com/487510
@ -25,6 +25,7 @@ Patch6: ghostscript-system-jasper.patch
Patch7: ghostscript-pksmraw.patch
Patch8: ghostscript-jbig2dec-nullderef.patch
Patch9: ghostscript-gs-executable.patch
Patch10: ghostscript-cups-filters.patch
Requires: urw-fonts >= 1.1, ghostscript-fonts
BuildRequires: xz
@ -85,6 +86,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
@ -115,6 +125,9 @@ rm -rf libpng zlib jpeg jasper
# Fix scripts so they don't get broken on install (bug #502550).
%patch9 -p1 -b .gs-executable
# Install CUPS filter convs files in the correct place.
%patch10 -p1 -b .cups-filters
# Convert manual pages to UTF-8
from8859_1() {
iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@ -218,11 +231,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc
# Don't ship ijs example client or server
rm -f $RPM_BUILD_ROOT%{_bindir}/ijs_{client,server}_example
# Don't ship files that get shipped in the cups package.
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/cups
rm -f $RPM_BUILD_ROOT%{_libdir}/cups/filter/pstoraster
rm -f $RPM_BUILD_ROOT/usr/lib/cups/filter/pstoraster
# Don't ship URW fonts; we already have them.
rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Font
@ -270,10 +278,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libijs-*.so*
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/%{gs_dot_ver}
/usr/lib/cups/filter/pstopxl
%{_datadir}/cups/model/pxl*
%config(noreplace) /etc/ghostscript/%{gs_dot_ver}/*
/usr/lib/cups/filter/pdftoraster
%files doc
%defattr(-,root,root)
@ -284,6 +289,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
@ -296,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so
%changelog
* Thu Oct 15 2009 Tim Waugh <twaugh@redhat.com> 8.70-2
- New cups sub-package for pstoraster/pdftoraster/pstopxl.
* Mon Aug 3 2009 Tim Waugh <twaugh@redhat.com> 8.70-1
- 8.70.
- License has changed to GPLv3+. Packages containing programs that