[supybot-gribble/f15: 8/8] Updated to upstream latest

[Dave Riches]

commit d407d52049d3597a1982f1539b91f131f8494ad9
Author: Dave Riches <david.r at ultracar.co.uk>
Date:   Sun Oct 16 12:06:28 2011 +0100

    Updated to upstream latest

 supybot-gribble.spec |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/supybot-gribble.spec b/supybot-gribble.spec
index 00c0ffb..cac8d2c 100644
--- a/supybot-gribble.spec
+++ b/supybot-gribble.spec
@@ -1,23 +1,14 @@
 Summary:	Cross-platform support bot based on supybot
 Name:		supybot-gribble
 Version:	0.83.4.1
-<<<<<<< HEAD
-Release:	9%{?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
 
@@ -63,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
@@ -85,12 +72,9 @@ rm  -rf %{buildroot}
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Sun Oct 16 2011 david <david.r at ultracar.co.uk> - 0.83.4.1-10
 - Updated from upstream to fix regex exploit
 
->>>>>>> master
 * Mon Jul 25 2011 david <david.r at ultracar.co.uk> - 0.83.4.1-9
 - fixed obsoletes issue...again