From f087620520591628bf0cf81769682e5c3a491349 Mon Sep 17 00:00:00 2001
From: Luke Macken <lmacken@fedoraproject.org>
Date: Dec 11 2007 22:29:44 +0000
Subject: Update our patches


---

diff --git a/python-cherrypy-regression-test.patch b/python-cherrypy-regression-test.patch
index 79055c5..0821b0d 100644
--- a/python-cherrypy-regression-test.patch
+++ b/python-cherrypy-regression-test.patch
@@ -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__':
diff --git a/python-cherrypy-tutorial-doc.patch b/python-cherrypy-tutorial-doc.patch
index f2c4be9..6f4579f 100644
--- a/python-cherrypy-tutorial-doc.patch
+++ b/python-cherrypy-tutorial-doc.patch
@@ -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
diff --git a/python-cherrypy.spec b/python-cherrypy.spec
index 2685449..d6679a3 100644
--- a/python-cherrypy.spec
+++ b/python-cherrypy.spec
@@ -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 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/cherrypy/filters/*.py*
 
 %changelog
+* Tue Dec 11 2007 Luke Macken <lmacken@redhat.com> 2.2.1-7
+- Update our patches for 2.2.1
+
 * Mon Feb 19 2007 Luke Macken <lmacken@redhat.com> 2.2.1-6
 - Disable regression tests until we can figure out why they
   are dying in mock.