packages: Supybot/Supybot.spec - merge changes from supybot.spec

Tue Jan 18 07:59:16 CET 2011

Author: glen                         Date: Tue Jan 18 06:59:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge changes from supybot.spec

---- Files affected:
packages/Supybot:
   Supybot.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/Supybot/Supybot.spec
diff -u packages/Supybot/Supybot.spec:1.9 packages/Supybot/Supybot.spec:1.10

--- packages/Supybot/Supybot.spec:1.9	Thu Jul  8 10:47:52 2010
+++ packages/Supybot/Supybot.spec	Tue Jan 18 07:59:11 2011
@@ -1,21 +1,32 @@
 # $Revision$, $Date$
+# TODO
+# - rename to supybot
+%define		origname	Supybot
 Summary:	A cross-platform IRC bot written in Python
 Summary(pl.UTF-8):	Wieloplatformowy bot IRC-owy napisany w Pythonie
 Name:		Supybot
 Version:	0.83.4.1
-Release:	2
-License:	BSD
-Group:		Applications/Communications
-Source0:	http://dl.sourceforge.net/supybot/%{name}-%{version}.tar.bz2
-# Source0-md5:	96ce90559c7d6fde5e3c93174c509408
+Release:	1
+Group:		Applications/Networking
+# The entire source code is BSD except for
+# Supybot-0.83.4/plugins/Math/local/convertcore.py which is GPL v2
+License:	BSD and GPL v2
 URL:		http://supybot.com/
-BuildRequires:	python >= 1:2.4
-BuildRequires:	rpm-pythonprov
+Source0:	http://downloads.sourceforge.net/supybot/%{origname}-%{version}.tar.bz2
+# Source0-md5:	96ce90559c7d6fde5e3c93174c509408
+# Fix a conflict between python-json and the built in json module
+# in Python 2.6.  Already submitted and commited upstream.
+Patch0:		json.patch
+# fix karma plugin to actually work should go upstream
+Patch1:		karma-plugin.patch
+BuildRequires:	python-distribute
 BuildRequires:	rpmbuild(macros) >= 1.219
-%pyrequires_eq  python
-Requires:	python-sqlite
 Requires:	python-TwistedCore
-Requires:	pydoc
+Requires:	python-TwistedNames
+Requires:	python-dateutil
+Requires:	python-dictclient
+Requires:	python-feedparser
+Requires:	python-simplejson
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -23,16 +34,16 @@
 Supybot is a cross-platform IRC bot written in Python, known to run
 anywhere Python runs.
 
-* Supybot is actively developed.
-* Supybot offers nested commands.
-* Supybot has a powerful and flexible capability system for handling
+- Supybot is actively developed.
+- Supybot offers nested commands.
+- Supybot has a powerful and flexible capability system for handling
   security.
-* Supybot includes many plugins, and has many more ripe for the
+- Supybot includes many plugins, and has many more ripe for the
   picking on this very website.
-* Supybot supports multiple servers.
-* Supybot supports multiple channels.
-* Supybot is user-friendly.
-* Supybot is developer-friendly.
+- Supybot supports multiple servers.
+- Supybot supports multiple channels.
+- Supybot is user-friendly.
+- Supybot is developer-friendly.
 
 %description -l pl.UTF-8
 Supybot to wieloplatformowy bot IRC-owy napisany w Pythonie,
@@ -48,35 +59,66 @@
 - Jest przyjazny dla programistów.
 
 %prep
-%setup -q
+%setup -q -n %{origname}-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-
 %{__python} setup.py install \
+	--skip-build \
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
 %py_postclean
 
-install docs/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a docs/man/supybot.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a docs/man/supybot-adduser.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a docs/man/supybot-botchk.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a docs/man/supybot-plugin-create.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a docs/man/supybot-plugin-doc.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a docs/man/supybot-test.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a docs/man/supybot-wizard.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+# These are provided in python-feedparser, python-dateutil,
+# python-dictclient, and python-simplejson
+rm -rf $RPM_BUILD_ROOT%{py_sitescriptdir}/supybot/plugins/RSS/local
+rm -rf $RPM_BUILD_ROOT%{py_sitescriptdir}/supybot/plugins/Time/local
+rm -rf $RPM_BUILD_ROOT%{py_sitescriptdir}/supybot/plugins/Dict/local
+rm -rf $RPM_BUILD_ROOT%{py_sitescriptdir}/supybot/plugins/Google/local
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc docs/[A-Z]* ACKS ChangeLog README RELNOTES
-%attr(755,root,root) %{_bindir}/*
+%doc ACKS ChangeLog LICENSE README RELNOTES
+%doc docs/{ADVANCED_PLUGIN_CONFIG,ADVANCED_PLUGIN_TESTING,CAPABILITIES}
+%doc docs/{CONFIGURATION,FAQ,GETTING_STARTED,PLUGIN_TUTORIAL,STYLE}
+%doc docs/{USING_UTILS,USING_WRAP}
+%attr(755,root,root) %{_bindir}/supybot
+%attr(755,root,root) %{_bindir}/supybot-adduser
+%attr(755,root,root) %{_bindir}/supybot-botchk
+%attr(755,root,root) %{_bindir}/supybot-plugin-create
+%attr(755,root,root) %{_bindir}/supybot-plugin-doc
+%attr(755,root,root) %{_bindir}/supybot-plugin-package
+%attr(755,root,root) %{_bindir}/supybot-test
+%attr(755,root,root) %{_bindir}/supybot-wizard
 %{py_sitescriptdir}/supybot
 %if "%{py_ver}" > "2.4"
-%{py_sitescriptdir}/*.egg-info
+%{py_sitescriptdir}/supybot-*.egg-info
 %endif
-%{_mandir}/man1/*
+%{_mandir}/man1/supybot.1*
+%{_mandir}/man1/supybot-adduser.1*
+%{_mandir}/man1/supybot-botchk.1*
+%{_mandir}/man1/supybot-plugin-create.1*
+%{_mandir}/man1/supybot-plugin-doc.1*
+%{_mandir}/man1/supybot-test.1*
+%{_mandir}/man1/supybot-wizard.1*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -84,6 +126,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2011/01/18 06:59:11  glen
+- merge changes from supybot.spec
+
 Revision 1.9  2010/07/08 08:47:52  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Supybot/Supybot.spec?r1=1.9&r2=1.10&f=u

