rpms/python-cherrypy/FC-4 .cvsignore, 1.3, 1.4 python-cherrypy-regression-test.patch, 1.1, 1.2 python-cherrypy-tutorial-doc.patch, 1.2, 1.3 python-cherrypy.spec, 1.4, 1.5 sources, 1.3, 1.4

[Gijs Hollestelle (gijs)]

Author: gijs

Update of /cvs/extras/rpms/python-cherrypy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587

Modified Files:
	.cvsignore python-cherrypy-regression-test.patch 
	python-cherrypy-tutorial-doc.patch python-cherrypy.spec 
	sources 
Log Message:
Update to 2.1.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 May 2005 09:09:59 -0000	1.3
+++ .cvsignore	1 Nov 2005 11:37:21 -0000	1.4
@@ -1 +1 @@
-CherryPy-2.0.0.tar.gz
+CherryPy-2.1.0.tar.gz

python-cherrypy-regression-test.patch:

Index: python-cherrypy-regression-test.patch
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/FC-4/python-cherrypy-regression-test.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-cherrypy-regression-test.patch	6 Apr 2005 09:53:01 -0000	1.1
+++ python-cherrypy-regression-test.patch	1 Nov 2005 11:37:21 -0000	1.2
@@ -1,8 +1,11 @@
---- CherryPy-2.0.0b/cherrypy/test/test.py-orig	2005-03-20 20:24:17.437466584 +0100
-+++ CherryPy-2.0.0b/cherrypy/test/test.py	2005-03-20 20:23:39.860179200 +0100
-@@ -186,4 +186,4 @@
- #    - test hidden classes
- #    ...
+--- 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')
++
  
--raw_input('hit enter')
-+sys.exit(len(failedList))
+ 
+ if __name__ == '__main__':

python-cherrypy-tutorial-doc.patch:

Index: python-cherrypy-tutorial-doc.patch
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/FC-4/python-cherrypy-tutorial-doc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-cherrypy-tutorial-doc.patch	8 May 2005 09:09:59 -0000	1.2
+++ python-cherrypy-tutorial-doc.patch	1 Nov 2005 11:37:21 -0000	1.3
@@ -1,11 +1,25 @@
---- CherryPy-2.0.0/setup.py-orig	2005-04-25 16:58:26.000000000 +0200
-+++ CherryPy-2.0.0/setup.py	2005-05-08 10:39:16.000000000 +0200
-@@ -22,7 +22,7 @@
-       author_email="team at cherrypy.org",
-       url="http://www.cherrypy.org",
-       license="BSD",
--      packages=["cherrypy", "cherrypy.lib", "cherrypy.lib.filter", "cherrypy.tutorial", "cherrypy.test"],
-+      packages=["cherrypy", "cherrypy.lib", "cherrypy.lib.filter"],
-       download_url="http://www.cherrypy.org/wiki/CherryPyDownload",
- )
- 
+--- CherryPy-2.1.0/setup.py-orig	2005-11-01 12:01:25.000000000 +0100
++++ CherryPy-2.1.0/setup.py	2005-11-01 12:02:10.000000000 +0100
+@@ -35,22 +35,10 @@
+ cp_license="BSD"
+ packages=[
+     "cherrypy", "cherrypy.lib", "cherrypy.lib.filter",
+-    "cherrypy.tutorial", "cherrypy.test",
+ ]
+ download_url="http://sourceforge.net/project/showfiles.php?group_id=56099"
+ data_files=[
+-    ('cherrypy/tutorial',
+-        [
+-            'cherrypy/tutorial/tutorial.conf',
+-            'cherrypy/tutorial/README.txt',
+-            'cherrypy/tutorial/pdf_file.pdf',
+-            '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/has space.html',]),
+ ]
+ ###############################################################################
+ # end arguments for setup


Index: python-cherrypy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/FC-4/python-cherrypy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-cherrypy.spec	14 May 2005 12:45:56 -0000	1.4
+++ python-cherrypy.spec	1 Nov 2005 11:37:21 -0000	1.5
@@ -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.0.0
-Release:        2%{?dist}
+Version:        2.1.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.0.0.tar.gz
+Source0:        http://dl.sf.net/cherrypy/CherryPy-2.1.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.0.0
+%setup -q -n CherryPy-2.1.0
 %patch0 -p1 
 %patch1 -p1
 
@@ -48,6 +48,7 @@
 %dir %{python_sitelib}/cherrypy
 %dir %{python_sitelib}/cherrypy/lib
 %dir %{python_sitelib}/cherrypy/lib/filter
+%{python_sitelib}/cherrypy/favicon.ico
 %{python_sitelib}/cherrypy/*.py
 %{python_sitelib}/cherrypy/*.pyc
 %ghost %{python_sitelib}/cherrypy/*.pyo
@@ -59,6 +60,9 @@
 %ghost %{python_sitelib}/cherrypy/lib/filter/*.pyo
 
 %changelog
+* Tue Nov  1 2005 Gijs Hollestelle <gijs at gewis.nl> 2.1.0-1
+- Updated to 2.1.0
+
 * Sat May 14 2005 Gijs Hollestelle <gijs at gewis.nl> 2.0.0-2
 - Added dist tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 May 2005 09:09:59 -0000	1.3
+++ sources	1 Nov 2005 11:37:21 -0000	1.4
@@ -1 +1 @@
-1e244a9728717199418f8a24a78a3a3e  CherryPy-2.0.0.tar.gz
+10bd559bdfdf783101d83335dd8acf58  CherryPy-2.1.0.tar.gz