[pyutil] - Upstream released new version

[Ruben Kerkhof]

commit 6d4822cac2066cf7f2b1f506b533d4c9b4d63394
Author: Ruben <ruben at rubenkerkhof.com>
Date:   Fri Feb 11 16:04:13 2011 +0100

    - Upstream released new version

 pyutil-fixtests.patch                      |   14 +++++++-------
 pyutil-remove-darcs-dep.patch              |   22 ----------------------
 pyutil-remove-dependency-on-argparse.patch |   12 ++++++++++++
 pyutil-remove-dependency-on-trial.patch    |   25 -------------------------
 pyutil.spec                                |   26 ++++++++++++--------------
 5 files changed, 31 insertions(+), 68 deletions(-)
---
diff --git a/pyutil-fixtests.patch b/pyutil-fixtests.patch
index 54a0088..cdcc730 100644
--- a/pyutil-fixtests.patch
+++ b/pyutil-fixtests.patch
@@ -1,19 +1,19 @@
-diff -rupN pyutil-1.7.9.old/pyutil/testutil.py pyutil-1.7.9/pyutil/testutil.py
---- pyutil-1.7.9.old/pyutil/testutil.py	2010-06-02 17:21:34.000000000 -0400
-+++ pyutil-1.7.9/pyutil/testutil.py	2010-07-27 22:20:47.000000000 -0400
-@@ -11,7 +11,7 @@ class SignalMixin(unittest.TestCase):
+diff -up pyutil-1.8.1/pyutil/testutil.py.orig pyutil-1.8.1/pyutil/testutil.py
+--- pyutil-1.8.1/pyutil/testutil.py.orig	2011-02-09 19:16:17.313999637 +0100
++++ pyutil-1.8.1/pyutil/testutil.py	2011-02-09 19:16:49.078000013 +0100
+@@ -12,7 +12,7 @@ class SignalMixin(unittest.TestCase):
      # Twisted's twisted.test.test_process
      sigchldHandler = None
-     
+ 
 -    def setUpClass(self):
 +    def setUp(self):
          # make sure SIGCHLD handler is installed, as it should be on
          # reactor.run(). problem is reactor may not have been run when this
          # test runs.
-@@ -19,7 +19,7 @@ class SignalMixin(unittest.TestCase):
+@@ -20,7 +20,7 @@ class SignalMixin(unittest.TestCase):
              self.sigchldHandler = signal.signal(signal.SIGCHLD,
                                                  reactor._handleSigchld)
-     
+ 
 -    def tearDownClass(self):
 +    def tearDown(self):
          if self.sigchldHandler:
diff --git a/pyutil-remove-dependency-on-argparse.patch b/pyutil-remove-dependency-on-argparse.patch
new file mode 100644
index 0000000..6a5d5ee
--- /dev/null
+++ b/pyutil-remove-dependency-on-argparse.patch
@@ -0,0 +1,12 @@
+diff -up pyutil-1.8.1/setup.py.orig pyutil-1.8.1/setup.py
+--- pyutil-1.8.1/setup.py.orig	2011-02-11 15:06:23.307000442 +0100
++++ pyutil-1.8.1/setup.py	2011-02-11 15:06:38.465001573 +0100
+@@ -100,7 +100,7 @@ setup(name=PKG,
+       data_files=data_files,
+       setup_requires=setup_requires,
+       extras_require={'jsonutil': ['simplejson >= 2.1.0',]},
+-      install_requires=['argparse >= 0.8', 'zbase32 >= 1.0'],
++      install_requires=['zbase32 >= 1.0'],
+       classifiers=trove_classifiers,
+       entry_points = {
+           'console_scripts': [
diff --git a/pyutil.spec b/pyutil.spec
index 4941f67..9d827ac 100644
--- a/pyutil.spec
+++ b/pyutil.spec
@@ -1,26 +1,23 @@
 Name:           pyutil
-Version:        1.7.9
-Release:        4%{?dist}
+Version:        1.8.1
+Release:        1%{?dist}
 Summary:        A collection of mature utilities for Python programmers
 
 Group:          Development/Languages
 License:        GPLv2+
 URL:            http://allmydata.org/trac/pyutil
 Source0:        http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
-Patch0:         pyutil-remove-darcs-dep.patch
-Patch1:         pyutil-remove-dependency-on-trial.patch
-Patch2:         pyutil-fixtests.patch
+Patch0:         pyutil-fixtests.patch
+Patch1:		pyutil-remove-dependency-on-argparse.patch
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
-BuildRequires:  python-argparse
 BuildRequires:  python-zbase32
 BuildRequires:  python-twisted-core
 BuildRequires:  net-tools
 BuildRequires:  python-simplejson
 Requires:	python-twisted-core
-Requires:       python-argparse
 Requires:       python-zbase32
 Requires:       python-simplejson
 
@@ -35,14 +32,10 @@ alone in wanting tools like these.
 
 %prep
 %setup -q
-# remove dependency on darcs
+# replace deprecated function calls. Upstream ticket #3
 %patch0 -p1
-# remove dependency on setuptools_trial (#523034)
+# python >= 2.7 supplies argparse, but setuptools doesn't know that (upstream ticket #4)
 %patch1 -p1
-# replace depracated function calls. Needs upstreamed
-%patch2 -p1
-# remove accidentally added test file, reported upstream
-rm -v pyutil/test/test_decimalutil.py
 
 
 %build
@@ -61,6 +54,8 @@ mv %{buildroot}%{_bindir}/try_decoding %{buildroot}%{_bindir}/%{name}_try_decodi
 mv %{buildroot}%{_bindir}/unsort %{buildroot}%{_bindir}/%{name}_unsort
 mv %{buildroot}%{_bindir}/verinfo %{buildroot}%{_bindir}/%{name}_verinfo
 
+rm -rf %{buildroot}%{_docdir}/%{name}
+
 # remove shebang
 find %{buildroot}%{python_sitelib}/%{name} -type f -name \*.py -o -name test_template | \
 	xargs sed -i '/^#!\/usr\/bin\/env/d'
@@ -71,7 +66,7 @@ find %{buildroot}%{python_sitelib}/%{name} -type f -name \*.py -o -name test_tem
 
 %files
 %defattr(-,root,root,-)
-%doc README.txt COPYING.GPL COPYING.TGPPL.html CREDITS
+%doc README.rst NEWS.rst COPYING.GPL COPYING.TGPPL.html CREDITS
 %{python_sitelib}/%{name}
 %{python_sitelib}/%{name}-%{version}-*.egg-info
 %{_bindir}/%{name}_lines
@@ -85,6 +80,9 @@ find %{buildroot}%{python_sitelib}/%{name} -type f -name \*.py -o -name test_tem
 
 
 %changelog
+* Wed Feb 09 2011 Ruben Kerkhof <ruben at rubenkerkhof.com> 1.8.1-1
+- Upstream released new version
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild