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

- Reverted fix for bug #533462 until bug #541604 is solved.

Browse Source
This commit is contained in:
Tim Waugh 2009-12-10 16:42:14 +00:00
parent ef2f507fb4
commit 11269ac07c
2 changed files with 6 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
hplip-duplex-vs-number-up.patch
View File

@ -1,192 +0,0 @@
diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.duplex-vs-number-up hplip-3.9.8/prnt/drv/hpcups.drv.in
--- hplip-3.9.8/prnt/drv/hpcups.drv.in.duplex-vs-number-up 2009-11-18 16:23:26.600165519 +0000
+++ hplip-3.9.8/prnt/drv/hpcups.drv.in 2009-11-18 16:24:04.784163999 +0000
@@ -126,7 +126,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -811,7 +811,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -1045,7 +1045,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -1262,7 +1262,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -1675,7 +1675,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -1889,7 +1889,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -2126,7 +2126,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -3756,7 +3756,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -4017,7 +4017,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -4245,7 +4245,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -4617,7 +4617,7 @@ Manufacturer "HP"
{
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -5033,7 +5033,7 @@ Manufacturer "HP"
{
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -5433,7 +5433,7 @@ Manufacturer "HP"
{
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -6272,7 +6272,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -7626,7 +7626,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -8299,7 +8299,7 @@ Manufacturer "HP"
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -10182,7 +10182,7 @@ Manufacturer "HP"
Attribute "cupsIPPReason" "hplip.plugin-error/printer requires a binary plugin, run hp-setup" ""
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -10391,7 +10391,7 @@ Manufacturer "HP"
{
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -10527,7 +10527,7 @@ Manufacturer "HP"
{
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -10686,7 +10686,7 @@ Manufacturer "HP"
{
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"
@@ -10836,7 +10836,7 @@ Manufacturer "HP"
{
Group "General/General"
- Option "Duplex/Double-Sided Printing" PickOne PageSetup 10.0
+ Option "Duplex/Double-Sided Printing" PickOne AnySetup 10.0
Choice "DuplexNoTumble/Long Edge (Standard)" "<</Duplex true/Tumble false>>setpagedevice"
Choice "DuplexTumble/Short Edge (Flip)" "<</Duplex true/Tumble true>>setpagedevice"
*Choice "None/Off" "<</Duplex false/Tumble false>>setpagedevice"

17
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.9.8 Version: 3.9.8
Release: 24%{?dist} Release: 25%{?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
@ -27,8 +27,7 @@ Patch11: hplip-device-reconnected.patch
Patch13: hplip-plugin-error.patch Patch13: hplip-plugin-error.patch
Patch14: hplip-hpcups-sigpipe.patch Patch14: hplip-hpcups-sigpipe.patch
Patch15: hplip-hpcups-plugin.patch Patch15: hplip-hpcups-plugin.patch
Patch16: hplip-duplex-vs-number-up.patch Patch16: hplip-bad-low-ink-warning.patch
Patch17: hplip-bad-low-ink-warning.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(pre): /sbin/service Requires(pre): /sbin/service
@ -162,19 +161,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# (bug #513283). # (bug #513283).
%patch15 -p1 -b .hpcups-plugin %patch15 -p1 -b .hpcups-plugin
# Fixed duplex handling in hpcups.drv (bug #533462).
%patch16 -p1 -b .duplex-vs-number-up
# Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
%patch17 -p1 -b .bad-low-ink-warning %patch16 -p1 -b .bad-low-ink-warning
sed -i.duplex-constraints \ sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in prnt/drv/hpcups.drv.in
sed -i.flipped-duplex \
-e 's,\(Attribute.*cupsBackSide\),//\1,' \
-e 's,\(Attribute.*cupsFlipDuplex\),//\1,' \
prnt/drv/hpcups.drv.in
%build %build
aclocal aclocal
@ -379,6 +371,9 @@ fi
/usr/bin/update-desktop-database &>/dev/null ||: /usr/bin/update-desktop-database &>/dev/null ||:
%changelog %changelog
* Thu Dec 10 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-25
- Reverted fix for bug #533462 until bug #541604 is solved.
* Thu Nov 26 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-24 * Thu Nov 26 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-24
- Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926). - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).