rpms/supybot/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 supybot.spec, 1.8, 1.9 supybot-0.83.3-plugins.patch, 1.1, NONE supybot-0.83.3-python2.6.patch, 1.1, NONE

[Ricky Zhou (周家杰)]

Author: ricky

Update of /cvs/pkgs/rpms/supybot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22621

Modified Files:
	.cvsignore sources supybot.spec 
Removed Files:
	supybot-0.83.3-plugins.patch supybot-0.83.3-python2.6.patch 
Log Message:
* Mon May 18 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.4-1
- Upstream released new version.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	24 May 2008 19:39:30 -0000	1.2
+++ .cvsignore	19 May 2009 01:52:35 -0000	1.3
@@ -1 +1 @@
-Supybot-0.83.3.tar.bz2
+Supybot-0.83.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	24 May 2008 19:39:30 -0000	1.2
+++ sources	19 May 2009 01:52:35 -0000	1.3
@@ -1 +1 @@
-72f8f28f1d847b9070be1bc5f8b002a4  Supybot-0.83.3.tar.bz2
+e003a8f940a749bd6a6546418b8f0942  Supybot-0.83.4.tar.bz2


Index: supybot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/supybot/devel/supybot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- supybot.spec	14 Apr 2009 17:03:38 -0000	1.8
+++ supybot.spec	19 May 2009 01:52:36 -0000	1.9
@@ -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 bui
 
 %prep
 %setup -q -n %{origname}-%{version}
-%patch0 -b .plugins
-%patch1 -p1 -b .python2.6
 
 
 %build
@@ -61,11 +53,12 @@ CFLAGS="%{optflags}" %{__python} -c 'imp
 %{__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 'imp
 %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 'imp
 
 
 %changelog
+* Mon May 18 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.4-1
+- Upstream released new version.
+
 * Tue Apr 14 2009 Ricky Zhou <ricky at fedoraproject.org> - 0.83.3-11
 - Change define to global.
 - Remove old >= 8 conditional.


--- supybot-0.83.3-plugins.patch DELETED ---


--- supybot-0.83.3-python2.6.patch DELETED ---