- Use JobCancel compatibility method until cups-pk-helper-0.1.0 is packaged

(bug #581315).
This commit is contained in:
Tim Waugh 2010-04-12 11:25:23 +00:00
parent 46d234b9d7
commit 1f861f1126
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,17 @@
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)

View File

@ -7,7 +7,7 @@
Summary: A printer administration tool Summary: A printer administration tool
Name: system-config-printer Name: system-config-printer
Version: 1.2.0 Version: 1.2.0
Release: 12%{?dist} Release: 13%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/ URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base Group: System Environment/Base
@ -32,6 +32,7 @@ Patch12: system-config-printer-asyncipp-traceback.patch
Patch13: system-config-printer-cdi-lsb-paths.patch Patch13: system-config-printer-cdi-lsb-paths.patch
Patch14: system-config-printer-transience.patch Patch14: system-config-printer-transience.patch
Patch15: system-config-printer-cdi-make-and-model.patch Patch15: system-config-printer-cdi-make-and-model.patch
Patch16: system-config-printer-jobcancel-compat.patch
Patch100: system-config-printer-pycups-build.patch Patch100: system-config-printer-pycups-build.patch
@ -140,6 +141,10 @@ printers.
# check-device-ids: use make-and-model field for best-matching. # check-device-ids: use make-and-model field for best-matching.
%patch15 -p1 -b .cdi-make-and-model %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} pushd pycups-%{pycups_version}
# Fixed pycups build with new distutils. # Fixed pycups build with new distutils.
@ -262,6 +267,10 @@ rm -rf %buildroot
exit 0 exit 0
%changelog %changelog
* Mon Apr 12 2010 Tim Waugh <twaugh@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@redhat.com> - 1.2.0-12 * Sat Mar 27 2010 Tim Waugh <twaugh@redhat.com> - 1.2.0-12
- check-device-ids: use make-and-model field for best-matching. - check-device-ids: use make-and-model field for best-matching.
- Use upstream fix for async bugs. - Use upstream fix for async bugs.