rpms/hplip/devel hplip.spec, 1.248, 1.249 hplip-duplex-vs-number-up.patch, 1.1, NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29496

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.10-5
- Reverted fix for bug #533462 until bug #541604 is solved.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -p -r1.248 -r1.249
--- hplip.spec	26 Nov 2009 14:33:07 -0000	1.248
+++ hplip.spec	10 Dec 2009 16:44:09 -0000	1.249
@@ -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-f
 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 <twaugh at redhat.com> - 3.9.10-5
+- Reverted fix for bug #533462 until bug #541604 is solved.
+
 * Thu Nov 26 2009 Tim Waugh <twaugh at redhat.com> 3.9.10-4
 - Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
 


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