[supybot-gribble/f14] Updated to upstream latest

[Dave Riches]

commit 21855ead76922fb57bed230c236532903c54f515
Author: Dave Riches <david.r at ultracar.co.uk>
Date:   Sun Oct 16 12:02:30 2011 +0100

    Updated to upstream latest

 supybot-gribble.spec |   27 ---------------------------
 1 files changed, 0 insertions(+), 27 deletions(-)
---
diff --git a/supybot-gribble.spec b/supybot-gribble.spec
index 269cd59..cac8d2c 100644
--- a/supybot-gribble.spec
+++ b/supybot-gribble.spec
@@ -1,34 +1,21 @@
 Summary:	Cross-platform support bot based on supybot
 Name:		supybot-gribble
 Version:	0.83.4.1
-<<<<<<< HEAD
-Release:	8%{?dist}
-=======
 Release:	10%{?dist}
->>>>>>> master
 License:	BSD and GPLv2 and Python
 Group:		Applications/Internet
 URL:		http://sourceforge.net/apps/mediawiki/gribble/	
 # The source was pulled from upstreams git scm. Use the following
 # commands to generate the tarball
-<<<<<<< HEAD
-# git archive --format=tar --prefix=supybot-gribble-0.83.4.1/ --remote=git://gribble.git.sourceforge.net/gitroot/gribble/gribble 1e337bdfa9085133ddd54c82cffa69dfcaa13c9a > supybot-gribble-20110627.tar 
-Source0:	supybot-gribble-20110627.tar
-=======
 # git archive --format=tar --prefix=supybot-gribble-0.83.4.1/ --remote=git://gribble.git.sourceforge.net/gitroot/gribble/gribble b533290c7a0ab14e7f855bba930a421e2e72b0f0 > supybot-gribble-20111016.tar 
 Source0:	supybot-gribble-20111016.tar 
->>>>>>> master
 Patch0:		feedparser.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildArch:	noarch
 BuildRequires:	python-devel
 Requires:	python-sqlite2
-<<<<<<< HEAD
-Obsoletes: supybot =< 0.83.4.1-6%{dist}
-=======
 Obsoletes: supybot =< 0.83.4.1-7%{dist}
->>>>>>> master
 Provides: supybot = 0.83.4.1-8%{dist}
 
 %description
@@ -67,11 +54,7 @@ rm  -rf %{buildroot}
 %doc docs/{CONFIGURATION,FAQ,GETTING_STARTED,PLUGIN_TUTORIAL,STYLE}
 %doc docs/{USING_UTILS,USING_WRAP}
 %{python_sitelib}/supybot
-<<<<<<< HEAD
-%{python_sitelib}/supybot-0.83.4.1_gribble._2011_06_27T14_41_49_0400_-py2.*.egg-info
-=======
 %{python_sitelib}/supybot-0.83.4.1_gribble._2011_08_12T18_12_56_0400_-py2.*.egg-info
->>>>>>> master
 %{_bindir}/supybot
 %{_bindir}/supybot-adduser
 %{_bindir}/supybot-botchk
@@ -89,15 +72,6 @@ rm  -rf %{buildroot}
 
 
 %changelog
-<<<<<<< HEAD
-* 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
-
-* Sat Jul 02 2011 Dave Riches <david.r at ultracar.co.uk> - 0.83.4.1-6
-=======
 * Sun Oct 16 2011 david <david.r at ultracar.co.uk> - 0.83.4.1-10
 - Updated from upstream to fix regex exploit
 
@@ -108,7 +82,6 @@ rm  -rf %{buildroot}
 - removed conflicts, no longer required
 
 * Fri Jul 01 2011 Dave Riches <david.r at ultracar.co.uk> - 0.83.4.1-6
->>>>>>> master
 - fixed obsoletes to work with supybot
 
 * Thu Jun 30 2011 Dave Riches <david.r at ultracar.co.uk> - 0.83.4.1-5