rpms/TurboGears/devel TurboGears-1.0.3.2-setuptools.patch, 1.1, 1.2 TurboGears.spec, 1.21, 1.22

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11620

Modified Files:
	TurboGears-1.0.3.2-setuptools.patch TurboGears.spec 
Log Message:
* Mon Sep 24 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-2
- Update setuptools patch to "fix" CherryPy dependency error



TurboGears-1.0.3.2-setuptools.patch:

Index: TurboGears-1.0.3.2-setuptools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.3.2-setuptools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurboGears-1.0.3.2-setuptools.patch	13 Sep 2007 20:36:29 -0000	1.1
+++ TurboGears-1.0.3.2-setuptools.patch	24 Sep 2007 19:59:56 -0000	1.2
@@ -1,8 +1,10 @@
---- setup.py.orig	2007-09-13 16:14:36.000000000 -0400
-+++ setup.py	2007-09-13 16:20:51.000000000 -0400
-@@ -18,32 +18,22 @@
+--- setup.py.orig	2007-09-24 15:30:20.000000000 -0400
++++ setup.py	2007-09-24 15:31:10.000000000 -0400
+@@ -16,34 +16,23 @@
+             "TurboJson >= 0.9.9",
+             "TurboCheetah >= 0.9.5",
              "TurboKid >= 1.0.2",
-             "CherryPy >= 2.2.1,<3.0.0alpha",
+-            "CherryPy >= 2.2.1,<3.0.0alpha",
              "simplejson >= 1.3",
 -            "elementtree >= 1.2.6",
              "PasteScript >= 0.9.7",
@@ -35,7 +37,7 @@
  
  setup(
      name="TurboGears",
-@@ -127,7 +117,7 @@
+@@ -127,7 +116,7 @@
      extras_require = {
          "exp" : ["TGFastData"],
          "standard" : standard,


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TurboGears.spec	13 Sep 2007 20:38:06 -0000	1.21
+++ TurboGears.spec	24 Sep 2007 19:59:56 -0000	1.22
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -84,6 +84,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Sep 24 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-2
+- Update setuptools patch to "fix" CherryPy dependency error
+
 * Mon Sep 13 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-1
 - 1.0.3.2
 - Remove etree patch