From 87dd9853c5e286089add80c973b5713fe9733a33 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Wed, 7 Dec 2005 14:32:03 +0000
Subject: [PATCH] - Use upstream patch 0.9.7-2. - No longer need lpgetstatus or
 compile patches.

---
 hplip.spec | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/hplip.spec b/hplip.spec
index 1597940..f7f6d20 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.7
-Release: 2
+Release: 3
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -11,8 +11,7 @@ Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.t
 Patch1: hplip-quiet.patch
 Patch2: hplip-desktop.patch
 Patch3: hplip-config.patch
-Patch4: hplip-compile.patch
-Patch5: hplip-lpgetstatus.patch
+Patch4: hplip-0.9.7-2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -63,11 +62,8 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Use static IP ports (for SELinux policy).
 %patch3 -p1 -b .config
 
-# Fix compilation.
-%patch4 -p1 -b .compile
-
-# Prevent LPGETSTATUS overrunning format buffer.
-%patch5 -p1 -b .lpgetstatus
+# Apply patch 0.9.7-2
+%patch4 -p1 -b .0.9.7-2
 
 %build
 %configure
@@ -154,6 +150,10 @@ if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
 fi
 
 %changelog
+* Wed Dec  7 2005 Tim Waugh <twaugh@redhat.com> 0.9.7-3
+- Use upstream patch 0.9.7-2.
+- No longer need lpgetstatus or compile patches.
+
 * Fri Nov 25 2005 Tim Waugh <twaugh@redhat.com> 0.9.7-2
 - Prevent LPGETSTATUS overrunning format buffer.