From eac6bf21d10e92104014b17592d71fd4b950d761 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Wed, 16 Sep 2009 14:47:10 +0000
Subject: [PATCH] - Fixed hp-setup trace when discovery page is skipped (bug
 #523685).

---
 hplip-discovery-method.patch | 11 +++++++++++
 hplip.spec                   |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 hplip-discovery-method.patch

diff --git a/hplip-discovery-method.patch b/hplip-discovery-method.patch
new file mode 100644
index 0000000..cb277a3
--- /dev/null
+++ b/hplip-discovery-method.patch
@@ -0,0 +1,11 @@
+diff -up hplip-3.9.8/ui4/setupdialog.py.discovery-method hplip-3.9.8/ui4/setupdialog.py
+--- hplip-3.9.8/ui4/setupdialog.py.discovery-method	2009-08-04 22:37:22.000000000 +0100
++++ hplip-3.9.8/ui4/setupdialog.py	2009-09-16 15:34:36.509431266 +0100
+@@ -171,6 +171,7 @@ class SetupDialog(QDialog, Ui_Dialog):
+             QTimer.singleShot(0, self.showRemovePage)
+         else:
+             if self.skip_discovery:
++                self.discovery_method = 1 # mDNS
+                 QTimer.singleShot(0, self.showDevicesPage)
+             else:
+                 QTimer.singleShot(0, self.showDiscoveryPage)
diff --git a/hplip.spec b/hplip.spec
index 1e217bb..26706a3 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -22,6 +22,7 @@ Patch6: hplip-state-reasons-newline.patch
 Patch7: hplip-parenths.patch
 Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
+Patch10: hplip-discovery-method.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -138,6 +139,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Set RequiresPageRegion in hpcups PPDs (bug #518756).
 %patch9 -p1 -b .requirespageregion
 
+# Fixed hp-setup trace when discovery page is skipped (bug #523685).
+%patch10 -p1 -b .discovery-method
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -341,6 +345,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Wed Sep 16 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-15
+- Fixed hp-setup trace when discovery page is skipped (bug #523685).
+
 * Fri Aug 28 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-14
 - Include missing base files.