From 1a36267ba820e81a91190197d8ff10b8b6c0e1b9 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mar 24 2010 10:43:02 +0000
Subject: - Use new JobCancelPurge cups-pk-helper method (bug #576496).


---

diff --git a/system-config-printer-JobCancel.patch b/system-config-printer-JobCancel.patch
new file mode 100644
index 0000000..36e5b59
--- /dev/null
+++ b/system-config-printer-JobCancel.patch
@@ -0,0 +1,12 @@
+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)
+ 
diff --git a/system-config-printer.spec b/system-config-printer.spec
index e8a1022..4768f91 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -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-mita.patch
 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@redhat.com> - 1.2.0-7
+- Use new JobCancelPurge cups-pk-helper method (bug #576496).
+
 * Mon Mar 22 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-6
 - Initialize downloadable_drivers when OpenPrinting query fails (bug #574562).