rpms/hplip/devel hplip-discovery-method.patch, NONE, 1.1 hplip.spec, 1.235, 1.236

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23839

Modified Files:
	hplip.spec 
Added Files:
	hplip-discovery-method.patch 
Log Message:
* Wed Sep 16 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-15
- Fixed hp-setup trace when discovery page is skipped (bug #523685).


hplip-discovery-method.patch:
 setupdialog.py |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE hplip-discovery-method.patch ---
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)


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- hplip.spec	28 Aug 2009 10:41:52 -0000	1.235
+++ hplip.spec	16 Sep 2009 14:47:10 -0000	1.236
@@ -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.patc
 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 at redhat.com> 3.9.8-15
+- Fixed hp-setup trace when discovery page is skipped (bug #523685).
+
 * Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-14
 - Include missing base files.