From 6290bae90e01e3c1e533e44d692a40e0d12149fd Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Thu, 9 Jun 2005 22:14:24 +0000
Subject: [PATCH] - Added Obsoletes: for xojpanel and hpoj-devel (but we don't
 actually     package devel files yet).

---
 hplip.spec | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/hplip.spec b/hplip.spec
index 4bbf312..e85f877 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,10 +1,15 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.3
-Release: 2
+Release: 3
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
-Obsoletes: hpoj
+Obsoletes: hpoj <= 0.91
+Obsoletes: xojpanel <= 0.91
+
+# This is needed for upgrades, but we don't package devel files yet.
+Obsoletes: hpoj-devel <= 0.91
+
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
 Patch1: hplip-forward-decl.patch
@@ -133,6 +138,10 @@ if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
 fi
 
 %changelog
+* Thu Jun  9 2005 Tim Waugh <twaugh@redhat.com> 0.9.3-3
+- Added Obsoletes: for xojpanel and hpoj-devel (but we don't actually package
+  devel files yet).
+
 * Thu Jun  9 2005 Tim Waugh <twaugh@redhat.com> 0.9.3-2
 - Add 'hpaio' to SANE config file, not 'hpoj' (bug #159954).