From 7d301aa8895f3e14d8bd79212a59015f18c12a1f Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Fri, 1 Apr 2011 09:48:09 +0100
Subject: [PATCH] Some rpmlint fixes for obsoletes/provides tags.

---
 hplip.spec | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/hplip.spec b/hplip.spec
index ea795d0..80e5798 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,12 +1,14 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.11.3a
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
-Obsoletes: hpoj <= 0.91
-Obsoletes: xojpanel <= 0.91
+Obsoletes: hpoj < 0.91
+Provides: hpoj = 0.91
+Obsoletes: xojpanel < 0.91
+Provides: xojpanel = 0.91
 
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
@@ -130,7 +132,8 @@ PhotoSmart, DeskJet 990C, and PhotoSmart 100 series.
 Summary: SANE driver for scanners in HP's multi-function devices
 Group: System Environment/Daemons
 License: GPLv2+
-Obsoletes: libsane-hpoj <= 0.91
+Obsoletes: libsane-hpoj < 0.91
+Provides: libsane-hpoj = 0.91
 Requires: sane-backends
 Requires: %{name}-libs = %{version}-%{release}
 
@@ -461,6 +464,7 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root)
 %{_libdir}/libhpip.so.*
+# The so symlink is required here (see bug #489059).
 %{_libdir}/libhpmud.so*
 # Python extension
 %{python_sitearch}/*
@@ -520,6 +524,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Fri Apr  1 2011 Tim Waugh <twaugh@redhat.com> 3.11.3a-2
+- Some rpmlint fixes for obsoletes/provides tags.
+
 * Thu Mar 31 2011 Tim Waugh <twaugh@redhat.com> 3.11.3a-1
 - 3.11.3a.