diff --git a/hplip-duplex-vs-number-up.patch b/hplip-duplex-vs-number-up.patch new file mode 100644 index 0000000..d052eee --- /dev/null +++ b/hplip-duplex-vs-number-up.patch @@ -0,0 +1,192 @@ +diff -up hplip-3.9.10/prnt/drv/hpcups.drv.in.duplex-vs-number-up hplip-3.9.10/prnt/drv/hpcups.drv.in +--- hplip-3.9.10/prnt/drv/hpcups.drv.in.duplex-vs-number-up 2009-11-18 17:48:18.216163459 +0000 ++++ hplip-3.9.10/prnt/drv/hpcups.drv.in 2009-11-18 17:48:34.678163562 +0000 +@@ -146,7 +146,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -817,7 +817,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -1042,7 +1042,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -1249,7 +1249,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -1656,7 +1656,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -1862,7 +1862,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -2094,7 +2094,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -3786,7 +3786,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -4040,7 +4040,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -4265,7 +4265,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -4633,7 +4633,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -5044,7 +5044,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -5432,7 +5432,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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -6223,7 +6223,7 @@ Group "RLT/HP Real Life Technologies" + + 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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -7581,7 +7581,7 @@ Group "RLT/HP Real Life Technologies" + + 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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -8273,7 +8273,7 @@ Group "RLT/HP Real Life Technologies" + + 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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -10196,7 +10196,7 @@ Group "RLT/HP Real Life Technologies" + + 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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -10406,7 +10406,7 @@ Group "RLT/HP Real Life Technologies" + + 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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -10546,7 +10546,7 @@ Group "RLT/HP Real Life Technologies" + + 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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -10709,7 +10709,7 @@ Group "RLT/HP Real Life Technologies" + + 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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" +@@ -10859,7 +10859,7 @@ Group "RLT/HP Real Life Technologies" + + 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)" "<>setpagedevice" + Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" + *Choice "None/Off" "<>setpagedevice" diff --git a/hplip.spec b/hplip.spec index 1a75afa..1eca728 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -13,6 +13,7 @@ Conflicts: selinux-policy < 3.0.3-3 Url: http://hplip.sourceforge.net/ Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz +Patch1: hplip-duplex-vs-number-up.patch Patch2: hplip-strstr-const.patch Patch3: hplip-ui-optional.patch Patch4: hplip-no-asm.patch @@ -108,6 +109,9 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). rm -rf $RPM_BUILD_DIR/%{name}-%{version} %setup -q +# Fixed duplex handling in hpcups.drv (bug #533462). +%patch1 -p1 -b .duplex-vs-number-up + # Fix compilation. %patch2 -p1 -b .strstr-const @@ -330,6 +334,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Wed Nov 18 2009 Tim Waugh 3.9.10-2 +- Fixed duplex handling in hpcups.drv (bug #533462). + * Wed Nov 4 2009 Tim Waugh 3.9.10-1 - 3.9.10. No longer need clear-previous-state-reasons, hpcups-reorder, non-scripts, parenths, plugin-error,