rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Use correct fax PPD name for Qt3 UI.

Browse Source
This commit is contained in:
Tim Waugh 2010-08-12 13:20:28 +01:00
parent de72625b28
commit e4ce15440b
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hplip-fax-ppd.patch Normal file
View File

@ -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 = []

9
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.10.6 Version: 3.10.6
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -22,6 +22,7 @@ Patch5: hplip-device-ids.patch
Patch6: hplip-mucks-with-spooldir.patch Patch6: hplip-mucks-with-spooldir.patch
Patch7: hplip-snmp-quirks.patch Patch7: hplip-snmp-quirks.patch
Patch8: hplip-retry-open.patch Patch8: hplip-retry-open.patch
Patch9: hplip-fax-ppd.patch
Patch10: hplip-discovery-method.patch Patch10: hplip-discovery-method.patch
Patch11: hplip-device-reconnected.patch Patch11: hplip-device-reconnected.patch
Patch12: hplip-clear-old-state-reasons.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). # Retry when connecting to device fails (bug #532112).
%patch8 -p1 -b .retry-open %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). # Fixed hp-setup traceback when discovery page is skipped (bug #523685).
%patch10 -p1 -b .discovery-method %patch10 -p1 -b .discovery-method
@ -408,6 +412,9 @@ fi
%{_bindir}/hpcups-update-ppds &>/dev/null ||: %{_bindir}/hpcups-update-ppds &>/dev/null ||:
%changelog %changelog
* Thu Aug 12 2010 Tim Waugh <twaugh@redhat.com> - 3.10.6-2
- Use correct fax PPD name for Qt3 UI.
* Tue Jul 27 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.6-1 * Tue Jul 27 2010 Jiri Popelka <jpopelka@redhat.com> - 3.10.6-1
- 3.10.6. - 3.10.6.