[hplip/f12/master] Use correct fax PPD name for Qt3 UI.

[Tim Waugh]

commit e4ce15440b35b8f4d2f5ee31b1b09eeb28afd5ae
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Aug 12 13:20:28 2010 +0100

    Use correct fax PPD name for Qt3 UI.

 hplip-fax-ppd.patch |   20 ++++++++++++++++++++
 hplip.spec          |    9 ++++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/hplip-fax-ppd.patch b/hplip-fax-ppd.patch
new file mode 100644
index 0000000..b0386d4
--- /dev/null
+++ b/hplip-fax-ppd.patch
@@ -0,0 +1,20 @@
+diff -up hplip-3.10.6/ui/setupform.py.fax-ppd hplip-3.10.6/ui/setupform.py
+--- hplip-3.10.6/ui/setupform.py.fax-ppd	2010-08-12 13:08:01.846853509 +0100
++++ hplip-3.10.6/ui/setupform.py	2010-08-12 13:08:17.813979176 +0100
+@@ -886,13 +886,13 @@ class SetupForm(SetupForm_base):
+         QApplication.setOverrideCursor(QApplication.waitCursor)
+ 
+         if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_MARVELL:
+-            fax_ppd_name = "HP-Fax3-hplip" # Fixed width (2528 pixels) and 300dpi rendering
++            fax_ppd_name = "HP-Fax3-hpcups" # Fixed width (2528 pixels) and 300dpi rendering
+             nick = "HP Fax 3"
+         if self.mq.get('fax-type', FAX_TYPE_NONE) == FAX_TYPE_SOAP:
+-            fax_ppd_name = "HP-Fax2-hplip" # Fixed width (2528 pixels) and 300dpi rendering
++            fax_ppd_name = "HP-Fax2-hpcups" # Fixed width (2528 pixels) and 300dpi rendering
+             nick = "HP Fax 2"
+         else:
+-            fax_ppd_name = "HP-Fax-hplip" # Standard
++            fax_ppd_name = "HP-Fax-hpcups" # Standard
+             nick = "HP Fax"
+ 
+         ppds = []
diff --git a/hplip.spec b/hplip.spec
index 38c920e..1f3e2a5 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.10.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -22,6 +22,7 @@ Patch5: hplip-device-ids.patch
 Patch6: hplip-mucks-with-spooldir.patch
 Patch7: hplip-snmp-quirks.patch
 Patch8: hplip-retry-open.patch
+Patch9: hplip-fax-ppd.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch12: hplip-clear-old-state-reasons.patch
@@ -150,6 +151,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Retry when connecting to device fails (bug #532112).
 %patch8 -p1 -b .retry-open
 
+# Use correct fax PPD name for Qt3 UI.
+%patch9 -p1 -b .fax-ppd
+
 # Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 %patch10 -p1 -b .discovery-method
 
@@ -408,6 +412,9 @@ fi
 %{_bindir}/hpcups-update-ppds &>/dev/null ||:
 
 %changelog
+* Thu Aug 12 2010 Tim Waugh <twaugh at redhat.com> - 3.10.6-2
+- Use correct fax PPD name for Qt3 UI.
+
 * Tue Jul 27 2010 Jiri Popelka <jpopelka at redhat.com> - 3.10.6-1
 - 3.10.6.