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

[Tim Waugh]

Author: twaugh

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

Modified Files:
	hplip.spec 
Removed Files:
	hplip-duplex-vs-number-up.patch 
Log Message:
* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 3.9.8-22
- Reverted fix for bug #533462 until bug #541604 is solved.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/F-11/hplip.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -p -r1.240 -r1.241
--- hplip.spec	26 Nov 2009 14:36:16 -0000	1.240
+++ hplip.spec	10 Dec 2009 16:34:07 -0000	1.241
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -29,8 +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
-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
@@ -167,19 +166,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
@@ -398,6 +390,9 @@ fi
 exit 0
 
 %changelog
+* Thu Dec 10 2009 Tim Waugh <twaugh at redhat.com> - 3.9.8-22
+- Reverted fix for bug #533462 until bug #541604 is solved.
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-21
 - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
 


--- hplip-duplex-vs-number-up.patch DELETED ---