From 2913c4e49a6a48fac84dfd45e8cb8979d7174ef7 Mon Sep 17 00:00:00 2001
From: Toshio くらとみ <toshio@fedoraproject.org>
Date: Dec 01 2008 17:59:27 +0000
Subject: - Update to 3.1.1

- Fix python-2.6 build errors
- Make test code non-interactive via cmdline switch
- Refresh the no test and tutorial patch

---

diff --git a/.cvsignore b/.cvsignore
index 48a44a5..2d5b7cc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-CherryPy-3.0.3.tar.gz
+CherryPy-3.1.1.tar.gz
diff --git a/python-cherrypy-regression-test.patch b/python-cherrypy-regression-test.patch
deleted file mode 100644
index bbc758f..0000000
--- a/python-cherrypy-regression-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: CherryPy-3.0.3/cherrypy/test/test.py
-===================================================================
---- CherryPy-3.0.3.orig/cherrypy/test/test.py
-+++ CherryPy-3.0.3/cherrypy/test/test.py
-@@ -397,7 +397,6 @@ def run():
-     success = clp.run()
-     if clp.interactive:
-         print
--        raw_input('hit enter')
-     sys.exit(success)
- 
- 
diff --git a/python-cherrypy-tutorial-doc.patch b/python-cherrypy-tutorial-doc.patch
index 0406312..87954fa 100644
--- a/python-cherrypy-tutorial-doc.patch
+++ b/python-cherrypy-tutorial-doc.patch
@@ -1,16 +1,23 @@
-Index: CherryPy-3.0.3/setup.py
-===================================================================
---- CherryPy-3.0.3.orig/setup.py
-+++ CherryPy-3.0.3/setup.py
-@@ -38,23 +38,11 @@ url="http://www.cherrypy.org"
+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"
  cp_license="BSD"
  packages=[
      "cherrypy", "cherrypy.lib",
--    "cherrypy.tutorial", "cherrypy.test",
-     "cherrypy.wsgiserver",
+-    "cherrypy.tutorial", "cherrypy.test",
+     "cherrypy.wsgiserver", "cherrypy.process",
+     "cherrypy.scaffold",
  ]
- download_url="http://download.cherrypy.org/cherrypy/3.0.3/"
- data_files=[
+@@ -54,19 +53,6 @@ data_files=[
+                            ]),
+     ('cherrypy/scaffold/static', ['cherrypy/scaffold/static/made_with_cherrypy_small.png',
+                                   ]),
+-    ('cherrypy/test', ['cherrypy/test/style.css',
+-                       'cherrypy/test/test.pem',
+-                       ]),
+-    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
+-                              'cherrypy/test/static/dirback.jpg',]),
 -    ('cherrypy/tutorial',
 -        [
 -            'cherrypy/tutorial/tutorial.conf',
@@ -19,10 +26,6 @@ Index: CherryPy-3.0.3/setup.py
 -            'cherrypy/tutorial/custom_error.html',
 -        ]
 -    ),
-     ('cherrypy', ['cherrypy/favicon.ico',]),
--    ('cherrypy/test', ['cherrypy/test/style.css',]),
--    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
--                              'cherrypy/test/static/dirback.jpg',]),
  ]
  ###############################################################################
  # end arguments for setup
diff --git a/python-cherrypy.spec b/python-cherrypy.spec
index 4ff5204..b100fdf 100644
--- a/python-cherrypy.spec
+++ b/python-cherrypy.spec
@@ -1,26 +1,21 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-cherrypy
-Version:        3.0.3
-Release:        3%{?dist}
+Version:        3.1.1
+Release:        1%{?dist}
 Summary:        A 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
 Patch0:         python-cherrypy-tutorial-doc.patch
-Patch1:         python-cherrypy-regression-test.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
 BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 
 %description
 CherryPy allows developers to build web applications in much the same way 
@@ -30,7 +25,6 @@ results in smaller source code developed in less time.
 %prep
 %setup -q -n CherryPy-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %{__sed} -i 's/\r//' README.txt cherrypy/tutorial/README.txt cherrypy/tutorial/tutorial.conf
 
@@ -43,7 +37,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %check
 cd cherrypy/test
-%{__python} test.py
+%{__python} test.py --dumb
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +49,12 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Mon Dec 1 2008 Toshio Kuratomi <toshio@fedoraproject.org> - 3.1.1-1
+- Update to 3.1.1
+- Fix python-2.6 build errors
+- Make test code non-interactive via cmdline switch
+- Refresh the no test and tutorial patch
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 3.0.3-3
 - Rebuild for Python 2.6
 
diff --git a/sources b/sources
index 5855fd9..048774b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9c5efd94ff1b87f0f1cc29d09875670  CherryPy-3.0.3.tar.gz
+1803ebb8f930cea862ad4c9b2a910f0d  CherryPy-3.1.1.tar.gz