rpms/cups/F-12 cups.spec,1.548,1.549 cups-paps.patch,1.4,NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29664

Modified Files:
	cups.spec 
Removed Files:
	cups-paps.patch 
Log Message:
* Tue Dec  8 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-14
- No longer requires paps.  The texttopaps filter MIME conversion file
  is now provided by the paps package (bug #545036).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -p -r1.548 -r1.549
--- cups.spec	8 Dec 2009 09:38:20 -0000	1.548
+++ cups.spec	8 Dec 2009 09:56:49 -0000	1.549
@@ -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 <twaugh at redhat.com> - 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 <twaugh at redhat.com> - 1:1.4.2-13
 - Moved %%{_datadir}/cups/ppdc/*.h to the main package (bug #545348).
 


--- cups-paps.patch DELETED ---