diff --git a/.cvsignore b/.cvsignore index dc07718..edbc4c8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Supybot-0.83.3.tar.bz2 +Supybot-0.83.4.tar.bz2 diff --git a/sources b/sources index 5b7f263..522c72f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -72f8f28f1d847b9070be1bc5f8b002a4 Supybot-0.83.3.tar.bz2 +e003a8f940a749bd6a6546418b8f0942 Supybot-0.83.4.tar.bz2 diff --git a/supybot-0.83.3-plugins.patch b/supybot-0.83.3-plugins.patch deleted file mode 100644 index aff127a..0000000 --- a/supybot-0.83.3-plugins.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- setup.py.orig 2008-04-06 01:55:49.000000000 -0400 -+++ setup.py 2008-04-06 01:56:01.000000000 -0400 -@@ -44,7 +44,6 @@ - 'Filter', - 'Format', - 'Games', -- 'Google', - 'Herald', - 'Insult', - 'Internet', diff --git a/supybot-0.83.3-python2.6.patch b/supybot-0.83.3-python2.6.patch deleted file mode 100644 index 542fb85..0000000 --- a/supybot-0.83.3-python2.6.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -ur Supybot-0.83.3.orig/src/callbacks.py Supybot-0.83.3/src/callbacks.py ---- Supybot-0.83.3.orig/src/callbacks.py 2009-04-11 17:22:48.000000000 -0400 -+++ Supybot-0.83.3/src/callbacks.py 2009-04-11 17:20:16.000000000 -0400 -@@ -1051,7 +1051,7 @@ - setattr(self, attr, cb) - self.cbs.append(cb) - cb.log = log.getPluginLogger('%s.%s' % (self.name(),cb.name())) -- super(BasePlugin, self).__init__(*args, **kwargs) -+ super(BasePlugin, self).__init__() - - class SynchronizedAndFirewalled(log.MetaFirewall, utils.python.Synchronized): - pass # Necessary for the metaclass compatibility issue. -diff -ur Supybot-0.83.3.orig/src/drivers/__init__.py Supybot-0.83.3/src/drivers/__init__.py ---- Supybot-0.83.3.orig/src/drivers/__init__.py 2009-04-11 17:22:48.000000000 -0400 -+++ Supybot-0.83.3/src/drivers/__init__.py 2009-04-11 17:42:31.000000000 -0400 -@@ -48,7 +48,6 @@ - """Base class for drivers.""" - def __init__(self, *args, **kwargs): - add(self.name(), self) -- super(IrcDriver, self).__init__(*args, **kwargs) - - def run(self): - raise NotImplementedError -@@ -69,7 +68,7 @@ - def __init__(self, irc, servers=()): - self.networkGroup = conf.supybot.networks.get(irc.network) - self.servers = servers -- super(ServersMixin, self).__init__(irc) -+ super(ServersMixin, self).__init__() - - def _getServers(self): - # We do this, rather than utils.iter.cycle the servers in __init__, -diff -ur Supybot-0.83.3.orig/src/drivers/Socket.py Supybot-0.83.3/src/drivers/Socket.py ---- Supybot-0.83.3.orig/src/drivers/Socket.py 2009-04-11 17:22:48.000000000 -0400 -+++ Supybot-0.83.3/src/drivers/Socket.py 2009-04-11 17:21:25.000000000 -0400 -@@ -48,8 +48,8 @@ - class SocketDriver(drivers.IrcDriver, drivers.ServersMixin): - def __init__(self, irc): - self.irc = irc -- self.__parent = super(SocketDriver, self) -- self.__parent.__init__(irc) -+ drivers.IrcDriver.__init__(self, irc) -+ drivers.ServersMixin.__init__(self, irc) - self.conn = None - self.servers = () - self.eagains = 0 -@@ -77,7 +77,7 @@ - - def _getNextServer(self): - oldServer = getattr(self, 'currentServer', None) -- server = self.__parent._getNextServer() -+ server = drivers.ServersMixin._getNextServer(self) - if self.currentServer != oldServer: - self.resetDelay() - return server diff --git a/supybot.spec b/supybot.spec index 73265eb..ab8b922 100644 --- a/supybot.spec +++ b/supybot.spec @@ -2,23 +2,16 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: supybot -Version: 0.83.3 -Release: 11%{?dist} +Version: 0.83.4 +Release: 1%{?dist} Summary: Cross-platform IRC bot written in Python Group: Applications/Internet # The entire source code is BSD except for -# plugins/Math/convertcore.py which is GPLv2 +# Supybot-0.83.4/plugins/Math/local/convertcore.py which is GPLv2 License: BSD and GPLv2 URL: http://supybot.com Source0: http://downloads.sourceforge.net/supybot/%{origname}-%{version}.tar.bz2 -# Disable the Google plugin -Patch0: %{name}-%{version}-plugins.patch -# Backported upstream fixes for Python 2.6 -# All patches are from upstream git except for the first chunk in -# Supybot-0.83.3/src/drivers/__init__.py, which I'm submitting -# upstream. -Patch1: %{name}-%{version}-python2.6.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch @@ -28,6 +21,7 @@ Requires: python-twisted-names Requires: python-dateutil Requires: python-feedparser Requires: python-dictclient +Requires: python-simplejson Provides: Supybot = %{version}-%{release} %description @@ -39,8 +33,6 @@ to commands, as well as more than 50 builtin plugins providing around %prep %setup -q -n %{origname}-%{version} -%patch0 -b .plugins -%patch1 -p1 -b .python2.6 %build @@ -61,11 +53,12 @@ CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' bu %{__install} -m 644 docs/man/supybot-test.1 %{buildroot}%{_mandir}/man1/ %{__install} -m 644 docs/man/supybot-wizard.1 %{buildroot}%{_mandir}/man1/ -# These are provided in python-feedparser, python-dateutil, and -# python-dictclient -%{__rm} -rf %{buildroot}%{python_sitelib}/supybot/plugins/RSS/feedparser.py* -%{__rm} -rf %{buildroot}%{python_sitelib}/supybot/plugins/Time/dateutil -%{__rm} -rf %{buildroot}%{python_sitelib}/supybot/plugins/Dict/dictclient.py* +# These are provided in python-feedparser, python-dateutil, +# python-dictclient, and python-simplejson +%{__rm} -rf %{buildroot}%{python_sitelib}/supybot/plugins/RSS/local +%{__rm} -rf %{buildroot}%{python_sitelib}/supybot/plugins/Time/local +%{__rm} -rf %{buildroot}%{python_sitelib}/supybot/plugins/Dict/local +%{__rm} -rf %{buildroot}%{python_sitelib}/supybot/plugins/Google/local %clean @@ -76,7 +69,8 @@ CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' bu %defattr(-,root,root,-) %doc ACKS ChangeLog LICENSE README RELNOTES %doc docs/{ADVANCED_PLUGIN_CONFIG,ADVANCED_PLUGIN_TESTING,CAPABILITIES} -%doc docs/{GETTING_STARTED,PLUGIN_TUTORIAL,STYLE,USING_UTILS,USING_WRAP} +%doc docs/{CONFIGURATION,FAQ,GETTING_STARTED,PLUGIN_TUTORIAL,STYLE} +%doc docs/{USING_UTILS,USING_WRAP} %{python_sitelib}/*egg-info %{python_sitelib}/supybot %{_bindir}/supybot @@ -97,6 +91,9 @@ CFLAGS="%{optflags}" %{__python} -c 'import setuptools; execfile("setup.py")' bu %changelog +* Mon May 18 2009 Ricky Zhou - 0.83.4-1 +- Upstream released new version. + * Tue Apr 14 2009 Ricky Zhou - 0.83.3-11 - Change define to global. - Remove old >= 8 conditional.