rpms/hplip/devel hplip.spec,1.210,1.211

[Tim Waugh]

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-3
- Fixed HWResolution for 'Normal' output from the hpcups driver
  (laundpad bug #405400).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -p -r1.210 -r1.211
--- hplip.spec	27 Jul 2009 18:23:08 -0000	1.210
+++ hplip.spec	28 Jul 2009 09:01:42 -0000	1.211
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.6b
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -24,6 +24,7 @@ Patch8: hplip-libsane.patch
 Patch12: hplip-no-root-config.patch
 Patch13: hplip-ui-optional.patch
 Patch14: hplip-disc-media.patch
+Patch15: hplip-resolution-405400.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -136,6 +137,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Set disc media for disc page sizes (bug #495672).
 %patch14 -p1 -b .disc-media
 
+# Fixed HWResolution for 'Normal' output from the hpcups driver
+# (laundpad bug #405400).
+%patch15 -p1 -b .resolution-405400
+
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
@@ -343,6 +348,10 @@ fi
 exit 0
 
 %changelog
+* Tue Jul 28 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-3
+- Fixed HWResolution for 'Normal' output from the hpcups driver
+  (laundpad bug #405400).
+
 * Mon Jul 27 2009 Tim Waugh <twaugh at redhat.com> 3.9.6b-2
 - 3.9.6b.