rpms/python-cherrypy/EL-4 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

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/pkgs/rpms/python-cherrypy/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24210

Modified Files:
	python-cherrypy-regression-test.patch 
	python-cherrypy-tutorial-doc.patch python-cherrypy.spec 
Log Message:
Update our patches

python-cherrypy-regression-test.patch:

Index: python-cherrypy-regression-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/EL-4/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:44:59 -0000	1.2
+++ python-cherrypy-regression-test.patch	11 Dec 2007 22:29:43 -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()
+--- 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__':

python-cherrypy-tutorial-doc.patch:

Index: python-cherrypy-tutorial-doc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/EL-4/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:31:36 -0000	1.4
+++ python-cherrypy-tutorial-doc.patch	11 Dec 2007 22:29:44 -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 @@
+--- 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=[
      "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/pkgs/rpms/python-cherrypy/EL-4/python-cherrypy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-cherrypy.spec	11 Dec 2007 22:19:22 -0000	1.6
+++ python-cherrypy.spec	11 Dec 2007 22:29:44 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           python-cherrypy
 Version:        2.2.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
@@ -55,6 +55,9 @@
 %{python_sitelib}/cherrypy/filters/*.py*
 
 %changelog
+* Tue Dec 11 2007 Luke Macken <lmacken at redhat.com> 2.2.1-7
+- Update our patches for 2.2.1
+
 * Mon Feb 19 2007 Luke Macken <lmacken at redhat.com> 2.2.1-6
 - Disable regression tests until we can figure out why they
   are dying in mock.