diff --git a/cups-paps.patch b/cups-paps.patch deleted file mode 100644 index 91da82d..0000000 --- a/cups-paps.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.4b1/conf/mime.convs.in.paps cups-1.4b1/conf/mime.convs.in ---- cups-1.4b1/conf/mime.convs.in.paps 2008-10-08 22:07:45.000000000 +0100 -+++ cups-1.4b1/conf/mime.convs.in 2008-11-11 15:42:18.000000000 +0000 -@@ -45,7 +45,7 @@ application/x-cshell application/postsc - application/x-csource application/postscript 33 texttops - application/x-perl application/postscript 33 texttops - application/x-shell application/postscript 33 texttops --text/plain application/postscript 33 texttops -+text/plain application/postscript 33 texttopaps - text/html application/postscript 33 texttops - image/gif application/vnd.cups-postscript 66 imagetops - image/png application/vnd.cups-postscript 66 imagetops diff --git a/cups.spec b/cups.spec index 3eab81d..a940f69 100644 --- a/cups.spec +++ b/cups.spec @@ -9,7 +9,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4.2 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -32,7 +32,6 @@ Patch4: cups-serial.patch Patch5: cups-banners.patch Patch6: cups-serverbin-compat.patch Patch7: cups-no-export-ssllibs.patch -Patch8: cups-paps.patch Patch9: cups-direct-usb.patch Patch10: cups-lpr-help.patch Patch11: cups-peercred.patch @@ -114,9 +113,6 @@ BuildRequires: gcc >= 4.0.1 BuildPrereq: dbus-devel >= 0.90 Requires: dbus >= 0.90 -# The paps package uses pango to render UTF-8 text to PostScript. -Requires: paps >= 0.6.6-9 - # Requires tmpwatch for the cron.daily script (bug #218901). Requires: tmpwatch @@ -203,7 +199,6 @@ module. %patch5 -p1 -b .banners %patch6 -p1 -b .serverbin-compat %patch7 -p1 -b .no-export-ssllibs -%patch8 -p1 -b .paps %patch9 -p1 -b .direct-usb %patch10 -p1 -b .lpr-help %patch11 -p1 -b .peercred @@ -532,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Tue Dec 8 2009 Tim Waugh - 1:1.4.2-14 +- No longer requires paps. The texttopaps filter MIME conversion file + is now provided by the paps package (bug #545036). + * Tue Dec 8 2009 Tim Waugh - 1:1.4.2-13 - Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348).