[supybot-gribble/f14] conflicts: no longer required

[Dave Riches]

commit 1350eeac33910adb763647d5c318a0b4100f8569
Author: Dave Riches <dcr226 at fedorapeople.org>
Date:   Fri Jul 22 09:53:34 2011 +0100

    conflicts: no longer required

 supybot-gribble.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/supybot-gribble.spec b/supybot-gribble.spec
index 3da87de..fbf5cba 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:	7%{?dist}
+Release:	8%{?dist}
 License:	BSD and GPLv2 and Python
 Group:		Applications/Internet
 URL:		http://sourceforge.net/apps/mediawiki/gribble/	
@@ -15,7 +15,6 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:	noarch
 BuildRequires:	python-devel
 Requires:	python-sqlite2
-Conflicts:	supybot
 Obsoletes: supybot =< 0.83.4.1-6%{dist}
 Provides: supybot = 0.83.4.1-8%{dist}
 
@@ -73,6 +72,9 @@ rm  -rf %{buildroot}
 
 
 %changelog
+* Fri Jul 22 2011 Dave Riches <david.r at ultracar.co.uk> - 0.83.4.1-8
+- conflicts: no longer required
+
 * Thu Jul 21 2011 david <david.r at ultracar.co.uk> - 0.83.4.1-7
 - fixed obsoletes issue