From 46ca0a3521f812027ce29e74567fb1a3c34eca51 Mon Sep 17 00:00:00 2001
From: gijs <gijs@fedoraproject.org>
Date: Feb 21 2006 22:36:02 +0000
Subject: - Update to 2.1.1 (Security fix)


---

diff --git a/.cvsignore b/.cvsignore
index 604ae9a..5e5adb5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-CherryPy-2.1.0.tar.gz
+CherryPy-2.1.1.tar.gz
diff --git a/python-cherrypy-tutorial-doc.patch b/python-cherrypy-tutorial-doc.patch
index 42ae84b..f2c4be9 100644
--- a/python-cherrypy-tutorial-doc.patch
+++ b/python-cherrypy-tutorial-doc.patch
@@ -1,12 +1,11 @@
---- 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 @@
+--- 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 @@
  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',
 -        [
diff --git a/python-cherrypy.spec b/python-cherrypy.spec
index 59e224f..d0a1651 100644
--- a/python-cherrypy.spec
+++ b/python-cherrypy.spec
@@ -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.0
+Version:        2.1.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.1.0.tar.gz
+Source0:        http://dl.sf.net/cherrypy/CherryPy-2.1.1.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 @@ they would build any other object-oriented Python program. This usually
 results in smaller source code developed in less time.
 
 %prep
-%setup -q -n CherryPy-2.1.0
+%setup -q -n CherryPy-2.1.1
 %patch0 -p1 
 %patch1 -p1
 
@@ -60,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %{python_sitelib}/cherrypy/lib/filter/*.pyo
 
 %changelog
+* Wed Feb 22 2006 Gijs Hollestelle <gijs@gewis.nl> 2.1.1-1
+- Update to 2.1.1 (Security fix)
+
 * Tue Nov  1 2005 Gijs Hollestelle <gijs@gewis.nl> 2.1.0-1
 - Updated to 2.1.0
 
diff --git a/sources b/sources
index 737d2e1..c825a57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10bd559bdfdf783101d83335dd8acf58  CherryPy-2.1.0.tar.gz
+f36d73a8c38c1444285b37c3451dce86  CherryPy-2.1.1.tar.gz