rpms/hplip/F-11 hplip-discovery-method.patch, NONE, 1.1 hplip.spec, 1.230, 1.231
Tim Waugh
twaugh at fedoraproject.org
Wed Sep 23 09:40:19 UTC 2009
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30590
Modified Files:
hplip.spec
Added Files:
hplip-discovery-method.patch
Log Message:
* Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
- Enable parallel port support when configuring (bug #524979).
- Fixed hp-setup traceback 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/F-11/hplip.spec,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -p -r1.230 -r1.231
--- hplip.spec 28 Aug 2009 11:01:48 -0000 1.230
+++ hplip.spec 23 Sep 2009 09:40:18 -0000 1.231
@@ -23,6 +23,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
@@ -139,13 +140,16 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Set RequiresPageRegion in hpcups PPDs (bug #518756).
%patch9 -p1 -b .requirespageregion
+# Fixed hp-setup traceback when discovery page is skipped (bug #523685).
+%patch10 -p1 -b .discovery-method
+
%build
aclocal
automake --foreign --add-missing --copy
autoconf
%configure \
--enable-scan-build --enable-gui-build --enable-fax-build \
- --disable-foomatic-rip-hplip-install \
+ --disable-foomatic-rip-hplip-install --enable-pp-build \
--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
--enable-hpijs-install
@@ -356,6 +360,10 @@ fi
exit 0
%changelog
+* Wed Sep 23 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-16
+- Enable parallel port support when configuring (bug #524979).
+- Fixed hp-setup traceback when discovery page is skipped (bug #523685).
+
* Fri Aug 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-12
- Include missing base files.
More information about the fedora-extras-commits
mailing list