[kdeutils] monitor.py:441:get_notifications:KeyError: 'job-originating-user-name' (#739642) s/hal-cups-utils/sy

[Rex Dieter]

commit f1302925b22536e1f4eee19b58cd499fa0319ae0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 27 08:10:30 2011 -0500

    monitor.py:441:get_notifications:KeyError: 'job-originating-user-name' (#739642)
    s/hal-cups-utils/system-config-printer-udev/

 kdeutils-4.7.1-job-originating-user-name.patch |   11 +++++++++++
 kdeutils.spec                                  |   11 +++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/kdeutils-4.7.1-job-originating-user-name.patch b/kdeutils-4.7.1-job-originating-user-name.patch
new file mode 100644
index 0000000..9dc5a6d
--- /dev/null
+++ b/kdeutils-4.7.1-job-originating-user-name.patch
@@ -0,0 +1,11 @@
+--- kdeutils-4.7.1/printer-applet/monitor.py	2011-09-01 23:22:40.000000000 +0200
++++ kdeutils-4.7.1/printer-applet/monitor.py.job-originating-user-name	2011-09-27 14:50:45.211702691 +0200
+@@ -395,7 +395,7 @@ class Monitor:
+                         continue
+ 
+                     jobs[jobid] = attrs
+-                except AttributeError:
++                except KeyError:
+                     jobs[jobid] = {'job-k-octets': 0}
+                 except cups.IPPError, (e, m):
+                     self.watcher.cups_ipp_error (self, e, m)
diff --git a/kdeutils.spec b/kdeutils.spec
index 6e86d81..20407ee 100644
--- a/kdeutils.spec
+++ b/kdeutils.spec
@@ -5,7 +5,7 @@
 Name: kdeutils
 Epoch: 6
 Version: 4.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Utilities
 
 Group: Applications/System
@@ -17,6 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## upstreamable patches
 # default to gpg2 in kgpg, todo: support gpg *or* gpg2
 Patch50: kdeutils-4.6.80-gpg2.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=739642
+Patch51: kdeutils-4.7.1-job-originating-user-name.patch
 
 ## upstream patches
 
@@ -203,8 +205,8 @@ Summary:  KDE printer applet
 Group:    Applications/System
 Requires: PyKDE4
 Requires: dbus-python
-Requires: hal-cups-utils
 Requires: system-config-printer-libs
+Requires: system-config-printer-udev
 %description printer-applet
 %{summary}.
 
@@ -213,6 +215,7 @@ Requires: system-config-printer-libs
 %setup -q -n kdeutils-%{version}
 
 %patch50 -p1 -b .gpg2
+%patch51 -p1 -b .job-originating-user-name
 %patch200 -p1 -b .InstallPrinterDrivers
 
 
@@ -531,6 +534,10 @@ fi
 
 
 %changelog
+* Tue Sep 27 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.7.1-2
+- monitor.py:441:get_notifications:KeyError: 'job-originating-user-name' (#739642)
+- s/hal-cups-utils/system-config-printer-udev/
+
 * Tue Sep 06 2011 Than Ngo <than at redhat.com> - 6:4.7.1-1
 - 4.7.1