- Upstream patch to fix paper size order and LJColor device class color

space.

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -14,8 +14,9 @@ Conflicts: selinux-policy < 3.0.3-3
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
 Source1: hplip.fdi
-Patch1: hplip-strstr-const.patch
-Patch2: hplip-ui-optional.patch
+Patch1: hplip-hpcups-reorder.patch
+Patch2: hplip-strstr-const.patch
+Patch3: hplip-ui-optional.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -97,11 +98,14 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
+# Upstream patch to fix paper size order and LJColor device class color space.
+%patch1 -p1 -b .hpcups-reorder
+
 # Fix compilation.
-%patch1 -p1 -b .strstr-const
+%patch2 -p1 -b .strstr-const
 
 # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
-%patch2 -p1 -b .ui-optional
+%patch3 -p1 -b .ui-optional
 
 %build
 %configure --disable-foomatic-xml-install --disable-cups-install \
@@ -310,6 +314,10 @@ fi
 exit 0
 
 %changelog
+* Wed Aug 12 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-4
+- Upstream patch to fix paper size order and LJColor device class
+  color space.
+
 * Wed Aug 12 2009 Tim Waugh <twaugh@redhat.com> 3.9.8-3
 - The python-reportlab dependency was in the wrong sub-package.