[supybot-gribble/f15: 7/8] Updated to upstream latest
Dave Riches
dcr226 at fedoraproject.org
Sun Oct 16 11:07:56 UTC 2011
commit fbb72423bb418265ed880526571bfd9244eaaf22
Merge: 2f4a234 8eb97e9
Author: Dave Riches <david.r at ultracar.co.uk>
Date: Sun Oct 16 12:06:11 2011 +0100
Updated to upstream latest
.gitignore | 4 ++++
sources | 4 ++++
supybot-gribble.spec | 19 +++++++++++++++++++
3 files changed, 27 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 0a4df2d,cac8d2c..00c0ffb
--- a/supybot-gribble.spec
+++ b/supybot-gribble.spec
@@@ -1,14 -1,14 +1,23 @@@
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
@@@ -54,7 -54,7 +63,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,6 -72,9 +85,12 @@@
%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
More information about the scm-commits
mailing list