[supybot/f15/master] added conflict with supybot-gribble

[Dave Riches]

commit fb2fda4f991719669d89210ff027f231735ed87e
Author: Dave Riches <dcr226 at fedoraproject.org>
Date:   Mon Apr 18 21:38:59 2011 +0100

    added conflict with supybot-gribble

 supybot.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/supybot.spec b/supybot.spec
index 1521f9e..fa922d0 100644
--- a/supybot.spec
+++ b/supybot.spec
@@ -3,7 +3,7 @@
 
 Name:           supybot
 Version:        0.83.4.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Cross-platform IRC bot written in Python
 
 Group:          Applications/Internet
@@ -28,6 +28,7 @@ Requires:       python-feedparser
 Requires:       python-dictclient
 Requires:       python-simplejson
 Provides:       Supybot = %{version}-%{release}
+Conflicts:	supybot-gribble
 
 %description
 Supybot is a robust, user-friendly, and programmer-friendly Python IRC bot.
@@ -98,6 +99,9 @@ CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' bu
 
 
 %changelog
+* Mon Apr 18 2011 Dave Riches <david.r at ultracar.co.uk> - 0.83.4.1-7
+- added conflict with supybot-gribble
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.83.4.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild