From 444a25b7734a0eca99ab975bd082247aa20fdf1d Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Thu, 10 Dec 2009 16:44:09 +0000 Subject: [PATCH] - Reverted fix for bug #533462 until bug #541604 is solved. --- hplip-duplex-vs-number-up.patch | 192 -------------------------------- hplip.spec | 13 +-- 2 files changed, 4 insertions(+), 201 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 d052eee..0000000 --- a/hplip-duplex-vs-number-up.patch +++ /dev/null @@ -1,192 +0,0 @@ -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 91ee1c8..773e4f8 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: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -13,7 +13,6 @@ 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 @@ -110,9 +109,6 @@ 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 @@ -141,10 +137,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} 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 %configure \ @@ -346,6 +338,9 @@ fi /usr/bin/update-desktop-database &>/dev/null ||: %changelog +* Thu Dec 10 2009 Tim Waugh - 3.9.10-5 +- Reverted fix for bug #533462 until bug #541604 is solved. + * Thu Nov 26 2009 Tim Waugh 3.9.10-4 - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).