rpms/python-cherrypy/devel python-cherrypy-regression-test.patch, 1.3, 1.4 python-cherrypy-tutorial-doc.patch, 1.5, 1.6 python-cherrypy.spec, 1.7, 1.8

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/extras/rpms/python-cherrypy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4605

Modified Files:
	python-cherrypy-regression-test.patch 
	python-cherrypy-tutorial-doc.patch python-cherrypy.spec 
Log Message:
* Thu Jul 13 2006 Luke Macken <lmacken at redhat.com> 2.2.1-1
- Update to 2.2.1
- Remove unnecessary python-abi requirement



python-cherrypy-regression-test.patch:

Index: python-cherrypy-regression-test.patch
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy-regression-test.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-cherrypy-regression-test.patch	22 Apr 2006 13:08:42 -0000	1.3
+++ python-cherrypy-regression-test.patch	13 Jul 2006 18:52:33 -0000	1.4
@@ -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__':

python-cherrypy-tutorial-doc.patch:

Index: python-cherrypy-tutorial-doc.patch
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy-tutorial-doc.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-cherrypy-tutorial-doc.patch	22 Apr 2006 13:08:42 -0000	1.5
+++ python-cherrypy-tutorial-doc.patch	13 Jul 2006 18:52:33 -0000	1.6
@@ -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=[


Index: python-cherrypy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-cherrypy.spec	22 Apr 2006 13:08:42 -0000	1.7
+++ python-cherrypy.spec	13 Jul 2006 18:52:33 -0000	1.8
@@ -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 @@
 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 @@
 %ghost %{python_sitelib}/cherrypy/filters/*.pyo
 
 %changelog
+* Thu Jul 13 2006 Luke Macken <lmacken at redhat.com> 2.2.1-1
+- Update to 2.2.1
+- Remove unnecessary python-abi requirement
+
 * Sat Apr 22 2006 Gijs Hollestelle <gijs at gewis.nl> 2.2.0-1
 - Update to 2.2.0