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

[Gijs Hollestelle (gijs)]

Author: gijs

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

Modified Files:
	.cvsignore python-cherrypy-regression-test.patch 
	python-cherrypy-tutorial-doc.patch python-cherrypy.spec 
	sources 
Log Message:
* Sat Apr 22 2006 Gijs Hollestelle <gijs at gewis.nl> 2.2.0-1
- Update to 2.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Feb 2006 22:36:02 -0000	1.5
+++ .cvsignore	22 Apr 2006 13:08:42 -0000	1.6
@@ -1 +1 @@
-CherryPy-2.1.1.tar.gz
+CherryPy-2.2.0.tar.gz

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-cherrypy-regression-test.patch	1 Nov 2005 11:58:15 -0000	1.2
+++ python-cherrypy-regression-test.patch	22 Apr 2006 13:08:42 -0000	1.3
@@ -1,11 +1,10 @@
---- CherryPy-2.1.0/cherrypy/test/test.py-orig	2005-10-21 15:43:04.000000000 +0200
-+++ CherryPy-2.1.0/cherrypy/test/test.py	2005-11-01 12:06:51.000000000 +0100
-@@ -350,7 +350,7 @@
-     CPTestHarness(testList).run()
-     
-     print
--    raw_input('hit enter')
-+
- 
- 
- if __name__ == '__main__':
+--- 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
+@@ -311,7 +311,6 @@
+     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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-cherrypy-tutorial-doc.patch	21 Feb 2006 22:36:02 -0000	1.4
+++ python-cherrypy-tutorial-doc.patch	22 Apr 2006 13:08:42 -0000	1.5
@@ -1,11 +1,13 @@
---- CherryPy-2.1.1-orig/setup.py	2006-02-22 00:28:44.000000000 +0100
-+++ CherryPy-2.1.1/setup.py	2006-02-22 00:31:11.000000000 +0100
-@@ -35,21 +35,9 @@
+--- 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
+@@ -36,23 +36,11 @@
  cp_license="BSD"
  packages=[
      "cherrypy", "cherrypy.lib", "cherrypy.lib.filter",
--    "cherrypy.tutorial", "cherrypy.test",
+-    "cherrypy.tutorial", "cherrypy.test", "cherrypy.filters",
++    "cherrypy.filters",
  ]
+ download_url="http://sourceforge.net/project/showfiles.php?group_id=56099"
  data_files=[
 -    ('cherrypy/tutorial',
 -        [
@@ -18,7 +20,8 @@
      ('cherrypy', ['cherrypy/favicon.ico',]),
 -    ('cherrypy/test', ['cherrypy/test/style.css',]),
 -    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
--                              'cherrypy/test/static/has space.html',]),
+-                              'cherrypy/test/static/has space.html',
+-                              'cherrypy/test/static/dirback.jpg',]),
  ]
  ###############################################################################
  # end arguments for setup


Index: python-cherrypy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-cherrypy.spec	21 Feb 2006 22:36:02 -0000	1.6
+++ python-cherrypy.spec	22 Apr 2006 13:08:42 -0000	1.7
@@ -2,13 +2,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-cherrypy
-Version:        2.1.1
+Version:        2.2.0
 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.1.1.tar.gz
+Source0:        http://dl.sf.net/cherrypy/CherryPy-2.2.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         python-cherrypy-tutorial-doc.patch
 Patch1:         python-cherrypy-regression-test.patch
@@ -22,7 +22,7 @@
 results in smaller source code developed in less time.
 
 %prep
-%setup -q -n CherryPy-2.1.1
+%setup -q -n CherryPy-2.2.0
 %patch0 -p1 
 %patch1 -p1
 
@@ -58,8 +58,14 @@
 %{python_sitelib}/cherrypy/lib/filter/*.py
 %{python_sitelib}/cherrypy/lib/filter/*.pyc
 %ghost %{python_sitelib}/cherrypy/lib/filter/*.pyo
+%{python_sitelib}/cherrypy/filters/*.py
+%{python_sitelib}/cherrypy/filters/*.pyc
+%ghost %{python_sitelib}/cherrypy/filters/*.pyo
 
 %changelog
+* Sat Apr 22 2006 Gijs Hollestelle <gijs at gewis.nl> 2.2.0-1
+- Update to 2.2.0
+
 * Wed Feb 22 2006 Gijs Hollestelle <gijs at gewis.nl> 2.1.1-1
 - Update to 2.1.1 (Security fix)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Feb 2006 22:36:02 -0000	1.5
+++ sources	22 Apr 2006 13:08:42 -0000	1.6
@@ -1 +1 @@
-f36d73a8c38c1444285b37c3451dce86  CherryPy-2.1.1.tar.gz
+13ea297f2f0c650cca856276a45ed29a  CherryPy-2.2.0.tar.gz