rpms/system-config-printer/devel system-config-printer-JobCancel.patch, NONE, 1.1 system-config-printer.spec, 1.376, 1.377

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3074

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.2.0-7
- Use new JobCancelPurge cups-pk-helper method (bug #576496).


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

--- NEW FILE system-config-printer-JobCancel.patch ---
diff -up system-config-printer-1.2.0/asyncpk1.py.JobCancel system-config-printer-1.2.0/asyncpk1.py
--- system-config-printer-1.2.0/asyncpk1.py.JobCancel	2010-02-18 15:17:50.000000000 +0000
+++ system-config-printer-1.2.0/asyncpk1.py	2010-03-24 09:37:25.782824070 +0000
@@ -431,7 +431,7 @@ class PK1Connection:
                                           args, kwds)
 
         self._call_with_pk (use_pycups,
-                            'JobCancel', tup, reply_handler, error_handler,
+                            'JobCancelPurge', tup, reply_handler, error_handler,
                             self._nothing_to_unpack,
                             self._conn.cancelJob, args, kwds)
 


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -p -r1.376 -r1.377
--- system-config-printer.spec	22 Mar 2010 17:33:13 -0000	1.376
+++ system-config-printer.spec	24 Mar 2010 10:43:02 -0000	1.377
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -25,6 +25,7 @@ Patch5: system-config-printer-kyocera-mi
 Patch6: system-config-printer-cdi-filename.patch
 Patch7: system-config-printer-reconnect-error.patch
 Patch8: system-config-printer-downloadable-drivers.patch
+Patch9: system-config-printer-JobCancel.patch
 
 Patch100: system-config-printer-pycups-build.patch
 
@@ -110,6 +111,9 @@ printers.
 # Initialize downloadable_drivers when OpenPrinting query fails (bug #574562).
 %patch8 -p1 -b .downloadable-drivers
 
+# Use new JobCancelPurge cups-pk-helper method (bug #576496).
+%patch9 -p1 -b .JobCancel
+
 pushd pycups-%{pycups_version}
 
 # Fixed pycups build with new distutils.
@@ -232,6 +236,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Wed Mar 24 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-7
+- Use new JobCancelPurge cups-pk-helper method (bug #576496).
+
 * Mon Mar 22 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-6
 - Initialize downloadable_drivers when OpenPrinting query fails (bug #574562).