[prev in list] [next in list] [prev in thread] [next in thread]
List: opensuse-commit
Subject: commit Supybot for openSUSE:Factory
From: root () Hilbert ! suse ! de (h_root)
Date: 2010-01-29 16:59:14
Message-ID: 20100129165914.96CC620245 () Hilbert ! suse ! de
[Download RAW message or body]
Hello community,
here is the log from the commit of package Supybot for openSUSE:Factory
checked in at Fri Jan 29 17:59:14 CET 2010.
--------
--- Supybot/Supybot.changes 2009-12-20 17:31:26.000000000 +0100
+++ Supybot/Supybot.changes 2010-01-20 11:39:53.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Jan 20 10:30:50 UTC 2010 - lars@linux-schulserver.de
+
+- added Supybot-0.83.4.1-popen_deprecated.patch to avoid
+ deprecation warnings (Thanks to Martin Lillepuu)
+- small specfile cleanup
+- build as noarch
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
Supybot-0.83.4.1-popen_deprecated.patch
Supybot-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Supybot.spec ++++++
--- /var/tmp/diff_new_pack.Xxnc06/_old 2010-01-29 17:57:21.000000000 +0100
+++ /var/tmp/diff_new_pack.Xxnc06/_new 2010-01-29 17:57:21.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package Supybot (Version 0.83.4.1)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Name: Supybot
Summary: IRC Bot
Version: 0.83.4.1
-Release: 3
+Release: 4
Group: Productivity/Networking/IRC
License: BSD3c(or similar) ; GPLv2+ ; Python License ..
Url: http://supybot.com/
@@ -33,6 +33,9 @@
Source1: %{name}-plugins-%{plugins_version}.tar.bz2
Source2: %{name}.sysconfig
Source3: %{name}.init
+Source10: Supybot-rpmlintrc
+Patch1: Supybot-0.83.4.1-popen_deprecated.patch
+BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{py_requires}
@@ -44,20 +47,9 @@
providing around 400 actual commands.
-
-Authors:
---------
- Jeremy Fincher <jemfinch@supybot.com>
- Daniel DiPaolo
- James Vega <jamessan@supybot.com>
- Brett Kelly
- Vincent Foley-Bourgon
- Daniel Berlin
- Keith Jones
- Stéphan Kochen
-
%prep
%setup -q -b 1
+%patch1 -p0
cp -a ../%{name}-plugins-%{plugins_version}/* plugins/
%build
@@ -65,22 +57,22 @@
python setup.py build
%install
-python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 docs/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+python setup.py install --prefix=%{_prefix} --root=%{buildroot} --record-rpm=INSTALLED_FILES
+install -d %{buildroot}/%{_mandir}/man1
+install -m 644 docs/man/*.1 %{buildroot}/%{_mandir}/man1
# fix non executable scripts
-chmod +x %buildroot%python_sitelib/supybot/plugins/RSS/local/feedparser.py
-chmod +x %buildroot%python_sitelib/supybot/plugins/Supybot/plugin.py
-chmod +x %buildroot%python_sitelib/supybot/plugins/ExternalNotice/supybot-external-notice.py
+chmod +x %{buildroot}/%{python_sitelib}/supybot/plugins/RSS/local/feedparser.py
+chmod +x %{buildroot}/%{python_sitelib}/supybot/plugins/Supybot/plugin.py
+chmod +x %{buildroot}/%{python_sitelib}/supybot/plugins/ExternalNotice/supybot-external-notice.py
# install init and sysconfig script
-install -Dm644 %{SOURCE2} %buildroot/var/adm/fillup-templates/sysconfig.supybot
-install -Dm755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/supybot
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-ln -s %{_sysconfdir}/init.d/supybot $RPM_BUILD_ROOT%{_sbindir}/rcsupybot
-%fdupes %buildroot
+install -Dm644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates/sysconfig.supybot
+install -Dm755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/init.d/supybot
+mkdir -p %{buildroot}/%{_sbindir}
+ln -s %{_sysconfdir}/init.d/supybot %{buildroot}/%{_sbindir}/rcsupybot
+%fdupes %{buildroot}
%clean
-rm -fr $RPM_BUILD_ROOT
+rm -fr %{buildroot}
%post
%fillup_and_insserv supybot
@@ -99,5 +91,5 @@
/var/adm/fillup-templates/sysconfig.supybot
%{_sysconfdir}/init.d/supybot
%{_sbindir}/rcsupybot
-
+1%changelog
%changelog
++++++ Supybot-0.83.4.1-popen_deprecated.patch ++++++
# see https://bugzilla.novell.com/show_bug.cgi?id=567384 for
# details
Index: scripts/supybot-botchk
===================================================================
--- scripts/supybot-botchk.orig
+++ scripts/supybot-botchk
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
###
# Copyright (c) 2005, Jeremiah Fincher
@@ -59,7 +59,7 @@ if __name__ == '__main__':
# import supybot.conf as conf
import os
import sys
- import popen2
+ import subprocess
import optparse
parser = optparse.OptionParser(usage='Usage: %prog [options]')
@@ -120,18 +120,20 @@ if __name__ == '__main__':
sys.exit(-1)
debug('Bot not found, starting.')
home = os.environ['HOME']
- inst = popen2.Popen4('sh')
+ inst = subprocess.Popen("sh", shell=True,
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
+
for filename in ('.login', '.bash_profile', '.profile', '.bashrc'):
filename = os.path.join(home, filename)
if os.path.exists(filename):
debug('Found %s, sourcing.' % filename)
- inst.tochild.write('source %s' % filename + os.linesep)
+ inst.stdin.write('source %s' % filename + os.linesep)
cmdline = "%s --daemon %s" % (options.supybot, options.conffile)
debug('Sending cmdline to sh process.')
- inst.tochild.write(cmdline + os.linesep)
- inst.tochild.close()
- debug('Received from sh process: %r' % inst.fromchild.read())
- ret = inst.wait()
+ inst.stdin.write(cmdline + os.linesep)
+ inst.stdin.close()
+ debug('Received from sh process: %r' % inst.stdout.read())
+ ret = inst.stdout.wait()
debug('Bot started, command line %r returned %s.' % (cmdline, ret))
sys.exit(ret)
else:
++++++ Supybot-rpmlintrc ++++++
# Two reasons not following the python naming policy:
# 1. Supybot is the Upstream name of the Software and
# Users might search for this name in YaST
# 2. The package exists since 2005
addFilter("python-naming-policy-not-applied")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic