From 11269ac07c9c99eed088e80861353f2e30f28165 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 10 Dec 2009 16:42:14 +0000 Subject: [PATCH] - Reverted fix for bug #533462 until bug #541604 is solved. --- hplip-duplex-vs-number-up.patch | 192 -------------------------------- hplip.spec | 17 +-- 2 files changed, 6 insertions(+), 203 deletions(-) delete mode 100644 hplip-duplex-vs-number-up.patch diff --git a/hplip-duplex-vs-number-up.patch b/hplip-duplex-vs-number-up.patch deleted file mode 100644 index 20097bc..0000000 --- a/hplip-duplex-vs-number-up.patch +++ /dev/null @@ -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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>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)" "<>setpagedevice" - Choice "DuplexTumble/Short Edge (Flip)" "<>setpagedevice" - *Choice "None/Off" "<>setpagedevice" diff --git a/hplip.spec b/hplip.spec index be271ad..1414010 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.9.8 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -27,8 +27,7 @@ Patch11: hplip-device-reconnected.patch Patch13: hplip-plugin-error.patch Patch14: hplip-hpcups-sigpipe.patch Patch15: hplip-hpcups-plugin.patch -Patch16: hplip-duplex-vs-number-up.patch -Patch17: hplip-bad-low-ink-warning.patch +Patch16: hplip-bad-low-ink-warning.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(pre): /sbin/service @@ -162,19 +161,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # (bug #513283). %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). -%patch17 -p1 -b .bad-low-ink-warning +%patch16 -p1 -b .bad-low-ink-warning sed -i.duplex-constraints \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \ 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 aclocal @@ -379,6 +371,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Thu Dec 10 2009 Tim Waugh 3.9.8-25 +- Reverted fix for bug #533462 until bug #541604 is solved. + * Thu Nov 26 2009 Tim Waugh 3.9.8-24 - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).