rpms/TurboGears/devel TurboGears-1.0.2.2-setuptools.patch,1.2,1.3

[Toshio Ernie Kuratomi (toshio)]

Author: toshio

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

Modified Files:
	TurboGears-1.0.2.2-setuptools.patch 
Log Message:
* Leave cherrypy in and add a maximum for SQLAlchemy.


TurboGears-1.0.2.2-setuptools.patch:

Index: TurboGears-1.0.2.2-setuptools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears-1.0.2.2-setuptools.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurboGears-1.0.2.2-setuptools.patch	11 May 2007 07:23:36 -0000	1.2
+++ TurboGears-1.0.2.2-setuptools.patch	10 Sep 2007 17:55:00 -0000	1.3
@@ -1,10 +1,10 @@
---- setup.py.orig	2007-05-11 02:49:06.000000000 -0400
-+++ setup.py	2007-05-11 02:49:30.000000000 -0400
-@@ -16,32 +16,21 @@
-         "TurboJson >= 0.9.9",
-         "TurboCheetah >= 0.9.5",
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -18,30 +18,20 @@ install_requires = [
          "TurboKid >= 1.0.1",
--        "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",
@@ -13,8 +13,9 @@
          "RuleDispatch >= 0.5a0.dev-r2303",
          "DecoratorTools >= 1.4",
 -        "ConfigObj >= 4.3.2"]
+-tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
 +        ]
- tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
++tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3,<0.4alpha"]
  standard = ["SQLObject>=0.8,<0.10dev"]
  
  # python 2.5 compatible list
@@ -34,3 +35,12 @@
  
  setup(
      name="TurboGears",
+@@ -122,7 +112,7 @@ the TurboGears subversion repository</a>
+     extras_require = {
+         "exp" : ["TGFastData"],
+         "standard" : standard,
+-        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
++        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3,<0.4alpha"],
+         "testtools" : ["nose >= 0.9.1"],
+         "tgtesttools" : tgtesttools,
+     },