rpms/system-config-printer/F-13 system-config-printer-jobcancel-compat.patch, NONE, 1.1 system-config-printer.spec, 1.388, 1.389

[Tim Waugh]

Author: twaugh

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

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-jobcancel-compat.patch 
Log Message:
* Mon Apr 12 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-13
- Use JobCancel compatibility method until cups-pk-helper-0.1.0 is
  packaged (bug #581315).


system-config-printer-jobcancel-compat.patch:
 asyncpk1.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-jobcancel-compat.patch ---
diff -up system-config-printer-1.2.0/asyncpk1.py.jobcancel-compat system-config-printer-1.2.0/asyncpk1.py
--- system-config-printer-1.2.0/asyncpk1.py.jobcancel-compat	2010-04-12 12:09:40.000000000 +0100
+++ system-config-printer-1.2.0/asyncpk1.py	2010-04-12 12:12:03.562024987 +0100
@@ -441,11 +441,10 @@ class PK1Connection:
         (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,
-                            'JobCancelPurge', tup, reply_handler, error_handler,
+                            'JobCancel', 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/F-13/system-config-printer.spec,v
retrieving revision 1.388
retrieving revision 1.389
diff -u -p -r1.388 -r1.389
--- system-config-printer.spec	27 Mar 2010 10:25:48 -0000	1.388
+++ system-config-printer.spec	12 Apr 2010 11:25:23 -0000	1.389
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -32,6 +32,7 @@ Patch12: system-config-printer-asyncipp-
 Patch13: system-config-printer-cdi-lsb-paths.patch
 Patch14: system-config-printer-transience.patch
 Patch15: system-config-printer-cdi-make-and-model.patch
+Patch16: system-config-printer-jobcancel-compat.patch
 
 Patch100: system-config-printer-pycups-build.patch
 
@@ -140,6 +141,10 @@ printers.
 # check-device-ids: use make-and-model field for best-matching.
 %patch15 -p1 -b .cdi-make-and-model
 
+# Use JobCancel compatibility method until cups-pk-helper-0.1.0 is
+# packaged (bug #581315).
+%patch16 -p1 -b .jobcancel-compat
+
 pushd pycups-%{pycups_version}
 
 # Fixed pycups build with new distutils.
@@ -262,6 +267,10 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Mon Apr 12 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-13
+- Use JobCancel compatibility method until cups-pk-helper-0.1.0 is
+  packaged (bug #581315).
+
 * Sat Mar 27 2010 Tim Waugh <twaugh at redhat.com> - 1.2.0-12
 - check-device-ids: use make-and-model field for best-matching.
 - Use upstream fix for async bugs.