rpms/hplip/F-11 hplip-duplex-vs-number-up.patch, NONE, 1.1 hplip.spec, 1.237, 1.238

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5951

Modified Files:
	hplip.spec 
Added Files:
	hplip-duplex-vs-number-up.patch 
Log Message:
* Mon Nov 18 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
- Fixed duplex handling in hpcups.drv (bug #533462).


hplip-duplex-vs-number-up.patch:
 hpcups.drv.in |   42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

--- NEW FILE hplip-duplex-vs-number-up.patch ---
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 17:50:37.585038764 +0000
+++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-11-18 17:50:48.908163814 +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"


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- hplip.spec	2 Nov 2009 16:22:15 -0000	1.237
+++ hplip.spec	18 Nov 2009 17:52:07 -0000	1.238
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -29,6 +29,7 @@ Patch12: hplip-retry-open.patch
 Patch13: hplip-plugin-error.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch15: hplip-hpcups-plugin.patch
+Patch16: hplip-duplex-vs-number-up.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -165,6 +166,9 @@ 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
+
 %build
 aclocal
 automake --foreign --add-missing --copy
@@ -382,6 +386,9 @@ fi
 exit 0
 
 %changelog
+* Mon Nov 18 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
+- Fixed duplex handling in hpcups.drv (bug #533462).
+
 * Mon Nov  2 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-18
 - Added 'requires proprietary plugin' to appropriate model names
   (bug #513283).