From 51ab428dd52d10db74883a83b42eeda59511f0d3 Mon Sep 17 00:00:00 2001
From: Luke Macken <lmacken@fedoraproject.org>
Date: Jul 13 2006 18:52:33 +0000
Subject: - Update to 2.2.1

- Remove unnecessary python-abi requirement

---

diff --git a/python-cherrypy-regression-test.patch b/python-cherrypy-regression-test.patch
index 13db256..0821b0d 100644
--- a/python-cherrypy-regression-test.patch
+++ b/python-cherrypy-regression-test.patch
@@ -1,10 +1,10 @@
---- CherryPy-2.2.0/cherrypy/test/test.py.orig	2006-03-30 17:36:26.000000000 +0200
-+++ CherryPy-2.2.0/cherrypy/test/test.py	2006-04-22 14:55:47.000000000 +0200
+--- cherrypy/test/test.py.orig	2006-07-13 14:12:11.000000000 -0400
++++ cherrypy/test/test.py	2006-07-13 14:12:19.000000000 -0400
 @@ -311,7 +311,6 @@
-     CommandLineParser(testList).run()
-     
-     print
--    raw_input('hit enter')
- 
- 
- if __name__ == '__main__':
+     CommandLineParser(testList).run()
+     
+     print
+-    raw_input('hit enter')
+ 
+ 
+ if __name__ == '__main__':
diff --git a/python-cherrypy-tutorial-doc.patch b/python-cherrypy-tutorial-doc.patch
index 04bd2a1..6f4579f 100644
--- a/python-cherrypy-tutorial-doc.patch
+++ b/python-cherrypy-tutorial-doc.patch
@@ -1,5 +1,5 @@
---- CherryPy-2.2.0/setup.py.orig	2006-04-22 15:04:08.000000000 +0200
-+++ CherryPy-2.2.0/setup.py	2006-04-22 15:04:27.000000000 +0200
+--- setup.py.orig	2006-07-13 14:15:25.000000000 -0400
++++ setup.py	2006-07-13 14:16:00.000000000 -0400
 @@ -36,23 +36,11 @@
  cp_license="BSD"
  packages=[
diff --git a/python-cherrypy.spec b/python-cherrypy.spec
index 5acbd42..c71694c 100644
--- a/python-cherrypy.spec
+++ b/python-cherrypy.spec
@@ -1,20 +1,18 @@
-%define pyver %(%{__python} -c "from distutils.sysconfig import get_python_version; print get_python_version()")
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-cherrypy
-Version:        2.2.0
+Version:        2.2.1
 Release:        1%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.cherrypy.org/
-Source0:        http://dl.sf.net/cherrypy/CherryPy-2.2.0.tar.gz
+Source0:        http://dl.sf.net/cherrypy/CherryPy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         python-cherrypy-tutorial-doc.patch
 Patch1:         python-cherrypy-regression-test.patch
 
 BuildArch:      noarch
-Requires:       python-abi = %{pyver}
 
 %description
 CherryPy allows developers to build web applications in much the same way 
@@ -22,9 +20,9 @@ they would build any other object-oriented Python program. This usually
 results in smaller source code developed in less time.
 
 %prep
-%setup -q -n CherryPy-2.2.0
-%patch0 -p1 
-%patch1 -p1
+%setup -q -n CherryPy-%{version}
+%patch0
+%patch1
 
 
 %build
@@ -63,6 +61,10 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %{python_sitelib}/cherrypy/filters/*.pyo
 
 %changelog
+* Thu Jul 13 2006 Luke Macken <lmacken@redhat.com> 2.2.1-1
+- Update to 2.2.1
+- Remove unnecessary python-abi requirement
+
 * Sat Apr 22 2006 Gijs Hollestelle <gijs@gewis.nl> 2.2.0-1
 - Update to 2.2.0