[system-config-printer/f15] Removed problematic PackageKit client support (bug #726996, bug #726938).
Tim Waugh
twaugh at fedoraproject.org
Tue Aug 2 15:10:09 UTC 2011
commit 9078910d27ae5cb968840bc048a022f3698b4d5e
Author: Tim Waugh <twaugh at redhat.com>
Date: Tue Aug 2 15:48:04 2011 +0100
Removed problematic PackageKit client support (bug #726996, bug #726938).
system-config-printer-no-packagekit.patch | 36 +++++++++++++++++++++++
system-config-printer-packagekit-optional.patch | 26 ----------------
system-config-printer.spec | 11 ++++--
3 files changed, 43 insertions(+), 30 deletions(-)
---
diff --git a/system-config-printer-no-packagekit.patch b/system-config-printer-no-packagekit.patch
new file mode 100644
index 0000000..8482ad8
--- /dev/null
+++ b/system-config-printer-no-packagekit.patch
@@ -0,0 +1,36 @@
+--- system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-01 10:47:11.614519332 +0100
++++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-02 15:45:33.807623959 +0100
+@@ -21,7 +21,6 @@
+
+ import cups, pprint, os, tempfile, re, string
+ import locale
+-import packagekit.client, packagekit.enums
+ from . import _debugprint
+
+ class Printer:
+@@ -829,24 +828,7 @@
+ missing executables
+ """
+ executables = missingExecutables(ppd)
+- packages = []
+- if executables:
+- unresolved_executables = []
+- client = packagekit.client.PackageKitClient ()
+- for executable in executables:
+- if not executable.startswith ("/"):
+- executable = "/usr/bin/" + executable
+-
+- result = client.search_file ([executable],
+- packagekit.enums.FILTER_NOT_INSTALLED)
+- if result:
+- packages.extend (set (map (lambda x: x.name, result)))
+- else:
+- unresolved_executables.append (executable)
+-
+- executables = unresolved_executables
+-
+- return (packages, executables)
++ return ([], executables)
+
+ def _main():
+ c = cups.Connection()
diff --git a/system-config-printer.spec b/system-config-printer.spec
index e5f31e4..ae35110 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -5,14 +5,14 @@
Summary: A printer administration tool
Name: system-config-printer
Version: 1.3.5
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
URL: http://cyberelk.net/tim/software/system-config-printer/
Group: System Environment/Base
Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
Patch1: system-config-printer-no-applet-in-gnome.patch
Patch2: system-config-printer-bug726682.patch
-Patch3: system-config-printer-packagekit-optional.patch
+Patch3: system-config-printer-no-packagekit.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92
BuildRequires: gettext-devel
@@ -80,8 +80,8 @@ printers.
# Import dbus in serversettings module (bug #726682).
%patch2 -p1 -b .bug726682
-# Make PackageKit optional (bug #726996).
-%patch3 -p1 -b .bug726682
+# Removed problematic PackageKit client support (bug #726996, bug #726938).
+%patch3 -p1 -b .no-packagekit
%build
%configure --with-udev-rules
@@ -209,6 +209,9 @@ if [ $1 -ge 1 ] ; then
fi
%changelog
+* Tue Aug 2 2011 Tim Waugh <twaugh at redhat.com> 1.3.5-3
+- Removed problematic PackageKit client support (bug #726996, bug #726938).
+
* Mon Aug 1 2011 Tim Waugh <twaugh at redhat.com> 1.3.5-2
- Make PackageKit optional (bug #726996).
More information about the scm-commits
mailing list