rpms/system-config-printer/F-12 system-config-printer-JobCancel.patch, NONE, 1.1 system-config-printer.spec, 1.365, 1.366

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3399

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-JobCancel.patch 
Log Message:
* Wed Mar 24 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-5
- Use upstream signature for JobCancel cups-pk-helper method (bug #576496).


system-config-printer-JobCancel.patch:
 asyncpk1.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE system-config-printer-JobCancel.patch ---
diff -up system-config-printer-1.1.18/asyncpk1.py.JobCancel system-config-printer-1.1.18/asyncpk1.py
--- system-config-printer-1.1.18/asyncpk1.py.JobCancel	2010-03-24 10:23:07.566700732 +0000
+++ system-config-printer-1.1.18/asyncpk1.py	2010-03-24 10:23:17.177832161 +0000
@@ -426,8 +426,7 @@ class PK1Connection:
     def cancelJob (self, *args, **kwds):
         (use_pycups, reply_handler, error_handler,
          tup) = self._args_kwds_to_tuple ([int],
-                                          [(None, None),
-                                           (None, False)], # purge_job
+                                          [(None, None)],
                                           args, kwds)
 
         self._call_with_pk (use_pycups,


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-12/system-config-printer.spec,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -p -r1.365 -r1.366
--- system-config-printer.spec	22 Mar 2010 17:31:35 -0000	1.365
+++ system-config-printer.spec	24 Mar 2010 10:45:14 -0000	1.366
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.1.18
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -19,6 +19,7 @@ Patch1: system-config-printer-no-epydoc.
 Patch2: system-config-printer-missing-imports.patch
 Patch3: system-config-printer-reconnect-error.patch
 Patch4: system-config-printer-downloadable-drivers.patch
+Patch5: system-config-printer-JobCancel.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -90,6 +91,9 @@ printers.
 # Initialize downloadable_drivers when OpenPrinting query fails (bug #574562).
 %patch4 -p1 -b .downloadable-drivers
 
+# Use upstream signature for JobCancel cups-pk-helper method (bug #576496).
+%patch5 -p1 -b .JobCancel
+
 %build
 %configure --with-udev-rules --with-polkit-1
 
@@ -206,6 +210,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Mar 24 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-5
+- Use upstream signature for JobCancel cups-pk-helper method (bug #576496).
+
 * Mon Mar 22 2010 Tim Waugh <twaugh at redhat.com> - 1.1.18-4
 - Initialize downloadable_drivers when OpenPrinting query fails (bug #574562).