[supybot-gribble/f14: 7/7] Updated to upstream latest

[Dave Riches]

commit 671810f85d6e3520f0c8212b8101dbd167fe6b84
Merge: 1350eea 8eb97e9
Author: Dave Riches <david.r at ultracar.co.uk>
Date:   Sun Oct 16 11:58:57 2011 +0100

    Updated to upstream latest

 .gitignore           |    4 ++++
 sources              |    4 ++++
 supybot-gribble.spec |   30 ++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index d148bbf,1431feb..75844a6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  /supybot-gribble-20110627.tar
++<<<<<<< HEAD
++=======
+ /supybot-gribble-20111016.tar
++>>>>>>> master
diff --cc sources
index b332cc3,9aca118..651d2d8
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +8e62dc8bd25ed5b45424df7b40358eec  supybot-gribble-20110627.tar
++=======
+ 98d48242a278deab6fed94ddf7915749  supybot-gribble-20111016.tar
++>>>>>>> master
diff --cc supybot-gribble.spec
index fbf5cba,cac8d2c..269cd59
--- a/supybot-gribble.spec
+++ b/supybot-gribble.spec
@@@ -1,21 -1,21 +1,34 @@@
  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
@@@ -54,7 -54,7 +67,11 @@@ 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
@@@ -72,13 -72,16 +89,26 @@@
  
  
  %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
+ 
+ * Mon Jul 25 2011 david <david.r at ultracar.co.uk> - 0.83.4.1-9
+ - fixed obsoletes issue...again
+ 
+ * Mon Jul 25 2011 david <david.r at ultracar.co.uk> - 0.83.4.1-8
+ - 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