rpms/cups/F-11 cups.spec,1.525,1.526 cups-str2831.patch,1.1,NONE

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups.spec 
Removed Files:
	cups-str2831.patch 
Log Message:
* Tue Nov  3 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
- Removed stale patch from STR #2831 which was causing problems with
  number-up (bug #532516).



Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -p -r1.525 -r1.526
--- cups.spec	27 Oct 2009 14:44:34 -0000	1.525
+++ cups.spec	3 Nov 2009 16:52:20 -0000	1.526
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -30,7 +30,6 @@ Patch0: cups-generic-ps.patch
 Patch1: cups-no-gzip-man.patch
 Patch2: cups-1.1.16-system-auth.patch
 Patch3: cups-multilib.patch
-Patch4: cups-str2831.patch
 Patch5: cups-serial.patch
 Patch6: cups-banners.patch
 Patch7: cups-serverbin-compat.patch
@@ -196,7 +195,6 @@ gzip -n postscript.ppd
 %patch1 -p1 -b .no-gzip-man
 %patch2 -p1 -b .system-auth
 %patch3 -p1 -b .multilib
-%patch4 -p1 -b .str2831
 %patch5 -p1 -b .serial
 %patch6 -p1 -b .banners
 %patch7 -p1 -b .serverbin-compat
@@ -523,6 +521,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Nov  3 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-8
+- Removed stale patch from STR #2831 which was causing problems with
+  number-up (bug #532516).
+
 * Tue Oct 27 2009 Jiri Popelka <jpopelka at redhat.com> 1:1.4.1-7
 - Fix incorrectly applied patch from #STR3285 (bug #531108).
 - Set the PRINTER_IS_SHARED variable for admin.cgi (bug #529634, #STR3390).


--- cups-str2831.patch DELETED ---