[python-cherrypy] Update to 3.2.1

[Toshio くらとみ]

commit c0f96a67cb4ba9624d69e08cc5c9237e1e6563d5
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Sat Jul 16 14:27:29 2011 -0700

    Update to 3.2.1

 cherrypy-unittest.patch            |   13 +++++++++++++
 python-cherrypy-tutorial-doc.patch |   19 ++++++++++---------
 python-cherrypy.spec               |   24 ++++++++++++++----------
 3 files changed, 37 insertions(+), 19 deletions(-)
---
diff --git a/cherrypy-unittest.patch b/cherrypy-unittest.patch
new file mode 100644
index 0000000..e7e2f7a
--- /dev/null
+++ b/cherrypy-unittest.patch
@@ -0,0 +1,13 @@
+Index: CherryPy-3.2.1/cherrypy/test/helper.py
+===================================================================
+--- CherryPy-3.2.1.orig/cherrypy/test/helper.py
++++ CherryPy-3.2.1/cherrypy/test/helper.py
+@@ -299,7 +299,7 @@ class CPWebCase(webtest.WebCase):
+     def test_gc(self):
+         if self.do_gc_test:
+             self.getPage("/gc/stats")
+-            self.assertBody("Statistics:")
++            self.assertMatchesBody("^Statistics:")
+     
+     def prefix(self):
+         return self.script_name.rstrip("/")
diff --git a/python-cherrypy-tutorial-doc.patch b/python-cherrypy-tutorial-doc.patch
index 87954fa..cc37c2e 100644
--- a/python-cherrypy-tutorial-doc.patch
+++ b/python-cherrypy-tutorial-doc.patch
@@ -1,15 +1,16 @@
-diff -up CherryPy-3.1.1/setup.py.orig CherryPy-3.1.1/setup.py
---- CherryPy-3.1.1/setup.py.orig	2008-12-01 09:50:36.000000000 -0800
-+++ CherryPy-3.1.1/setup.py	2008-12-01 09:51:38.000000000 -0800
-@@ -38,7 +38,6 @@ url="http://www.cherrypy.org"
+Index: CherryPy-3.2.1/setup.py
+===================================================================
+--- CherryPy-3.2.1.orig/setup.py
++++ CherryPy-3.2.1/setup.py
+@@ -59,7 +59,6 @@ url="http://www.cherrypy.org"
  cp_license="BSD"
  packages=[
      "cherrypy", "cherrypy.lib",
 -    "cherrypy.tutorial", "cherrypy.test",
-     "cherrypy.wsgiserver", "cherrypy.process",
+     "cherrypy.process",
      "cherrypy.scaffold",
- ]
-@@ -54,19 +53,6 @@ data_files=[
+     "cherrypy.wsgiserver",
+@@ -76,19 +75,6 @@ data_files=[
                             ]),
      ('cherrypy/scaffold/static', ['cherrypy/scaffold/static/made_with_cherrypy_small.png',
                                    ]),
@@ -27,5 +28,5 @@ diff -up CherryPy-3.1.1/setup.py.orig CherryPy-3.1.1/setup.py
 -        ]
 -    ),
  ]
- ###############################################################################
- # end arguments for setup
+ scripts = ["cherrypy/cherryd"]
+ 
diff --git a/python-cherrypy.spec b/python-cherrypy.spec
index d18a613..5c63654 100644
--- a/python-cherrypy.spec
+++ b/python-cherrypy.spec
@@ -3,23 +3,25 @@
 %endif
 
 Name:           python-cherrypy
-Version:        3.1.2
-Release:        6%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        Pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.cherrypy.org/
 Source0:        http://download.cherrypy.org/cherrypy/%{version}/CherryPy-%{version}.tar.gz
+# Don't ship the tests or tutorials in the python module directroy,
+# tutorial will be shipped as doc instead
 Patch0:         python-cherrypy-tutorial-doc.patch
-Patch1: python-cherrypy-changederrormessage.patch
+Patch1: cherrypy-unittest.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools-devel
-BuildRequires:  tidy
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
+BuildRequires:  python-nose
 
 %description
 CherryPy allows developers to build web applications in much the same way 
@@ -29,7 +31,7 @@ results in smaller source code developed in less time.
 %prep
 %setup -q -n CherryPy-%{version}
 %patch0 -p1
-%patch1 -p1 -b .errmsg
+%patch1 -p1
 
 %{__sed} -i 's/\r//' README.txt cherrypy/tutorial/README.txt cherrypy/tutorial/tutorial.conf
 
@@ -42,9 +44,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %check
 cd cherrypy/test
-# The tidy tool test needs tidy in the test dir
-ln -s %{_bindir}/tidy tidy
-PYTHONPATH='../../' %{__python} test.py --dumb
+# These two tests hang in the buildsystem so we have to disable them
+PYTHONPATH='../../' nosetests -v -s ./ -e 'test_SIGTERM' -e 'test_SIGHUP_tty'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Sat Jul 16 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 3.2.1-1
+- Update to 3.2.1
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild