[supybot-gribble/el6] removed conflicts, no longer needed

[Dave Riches]

commit c57143c6a9325d2606d7afd0d417881340201b28
Author: Dave Riches <david.r at ultracar.co.uk>
Date:   Tue Jul 26 10:16:00 2011 +0100

    removed conflicts, no longer needed

 supybot-gribble.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/supybot-gribble.spec b/supybot-gribble.spec
index 3f04ce1..a69dae6 100644
--- a/supybot-gribble.spec
+++ b/supybot-gribble.spec
@@ -1,7 +1,7 @@
 Summary:	Cross-platform support bot based on supybot
 Name:		supybot-gribble
 Version:	0.83.4.1
-Release:	6%{?dist}
+Release:	8%{?dist}
 License:	BSD and GPLv2 and Python
 Group:		Applications/Internet
 URL:		http://sourceforge.net/apps/mediawiki/gribble/	
@@ -15,8 +15,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:	noarch
 BuildRequires:	python-devel
 Requires:	python-sqlite2
-Conflicts:	supybot
-Obsoletes: supybot < 0.83.4.1-7%{dist}
+Obsoletes: supybot =< 0.83.4.1-7%{dist}
 Provides: supybot = 0.83.4.1-8%{dist}
 
 %description
@@ -73,6 +72,9 @@ rm  -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 26 2011 david <david.r at ultracar.co.uk> - 0.83.4.1-8
+- removed conflicts, no longer needed
+
 * Sat Jul 02 2011 Dave Riches <david.r at ultracar.co.uk> - 0.83.4.1-6
 - fixed obsoletes to work with supybot