From c35d8938826b8b31218c34e75c9a41633942feb6 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Fri, 29 Jul 2011 15:58:35 +0100
Subject: [PATCH] Also: applied patch to fix serversettings traceback, from
 upstream post-1.3.5 (bug #726682).

---
 system-config-printer-bug726682.patch | 11 +++++++++++
 system-config-printer.spec            |  6 ++++++
 2 files changed, 17 insertions(+)
 create mode 100644 system-config-printer-bug726682.patch

diff --git a/system-config-printer-bug726682.patch b/system-config-printer-bug726682.patch
new file mode 100644
index 0000000..3b6e2ed
--- /dev/null
+++ b/system-config-printer-bug726682.patch
@@ -0,0 +1,11 @@
+diff -up system-config-printer-1.3.5/serversettings.py.bug726682 system-config-printer-1.3.5/serversettings.py
+--- system-config-printer-1.3.5/serversettings.py.bug726682	2011-07-28 17:04:13.000000000 +0100
++++ system-config-printer-1.3.5/serversettings.py	2011-07-29 15:57:01.515904062 +0100
+@@ -23,6 +23,7 @@
+ import config
+ from gettext import gettext as _
+ import cups
++import dbus
+ import gobject
+ import gtk
+ import os
diff --git a/system-config-printer.spec b/system-config-printer.spec
index eafb597..b82cbdb 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -11,6 +11,7 @@ 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
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: gettext-devel
@@ -75,6 +76,9 @@ printers.
 # Don't start the applet in GNOME.
 %patch1 -p1 -b .no-applet-in-gnome
 
+# Import dbus in serversettings module (bug #726682).
+%patch2 -p1 -b .bug726682
+
 %build
 %configure --with-udev-rules
 
@@ -215,6 +219,8 @@ fi
   - Use "hostname" instead of "IP address" when asking for names of
     browse servers (bug #726134).
   - Updated translations.
+- Also: applied patch to fix serversettings traceback, from upstream
+  post-1.3.5 (bug #726682).
 
 * Thu Jul 21 2011 Tim Waugh <twaugh@redhat.com> 1.3.4-2
 - No longer requires glade (uses GtkBuilder instead).