Merge branch 'f14'

hplip-emit-SIGNAL.patch

@@ -0,0 +1,21 @@
+diff -up hplip-3.10.9/ui4/setupdialog.py.emit-SIGNAL hplip-3.10.9/ui4/setupdialog.py
+--- hplip-3.10.9/ui4/setupdialog.py.emit-SIGNAL	2010-11-10 18:42:13.000000000 +0100
++++ hplip-3.10.9/ui4/setupdialog.py	2010-11-11 11:59:47.000000000 +0100
+@@ -868,7 +868,7 @@ class SetupDialog(QDialog, Ui_Dialog):
+                 self.printer_name_ok = True
+ 
+                 self.FaxNameLineEdit.emit(SIGNAL("textChanged(const QString &)"),
+-                            (self.FaxNameLineEdit.text(),))
++                                          self.FaxNameLineEdit.text())
+ 
+         self.setIndicators()
+         self.setAddPrinterButton()
+@@ -900,7 +900,7 @@ class SetupDialog(QDialog, Ui_Dialog):
+                 self.fax_name_ok = True
+ 
+                 self.PrinterNameLineEdit.emit(SIGNAL("textChanged(const QString&)"),
+-                            (self.PrinterNameLineEdit.text(),))
++                                              self.PrinterNameLineEdit.text())
+ 
+         self.setIndicators()
+         self.setAddPrinterButton()

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -37,6 +37,7 @@ Patch23: hplip-network-timeout.patch
 Patch24: hplip-addgroup.patch
 Patch25: hplip-raw_deviceID-traceback.patch
 Patch26: hplip-UnicodeDecodeError.patch
+Patch27: hplip-emit-SIGNAL.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -242,6 +243,9 @@ done
 # Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739).
 %patch26 -p1 -b .UnicodeDecodeError
 
+# Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834).
+%patch27 -p1 -b .emit-SIGNAL
+
 sed -i.duplex-constraints \
     -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
     prnt/drv/hpcups.drv.in
@@ -468,6 +472,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Nov 1 2010 Jiri Popelka <jpopelka@redhat.com> 3.10.9-5
+- Don't emit SIGNALs in ui4.setupdialog.SetupDialog the PyQt3 way (bug #623834).
+
 * Sun Oct 24 2010 Jiri Popelka <jpopelka@redhat.com> 3.10.9-4
 - Avoid UnicodeDecodeError in printsettingstoolbox.py (bug #645739).