rpms/TurboGears/devel TurboGears-1.0.4.2-setuptools.patch, NONE, 1.1 TurboGears.spec, 1.28, 1.29 TurboGears-1.0.3.2-paginate.patch, 1.1, NONE TurboGears-1.0.3.2-setuptools.patch, 1.4, NONE

[Luke Macken (lmacken)]

Author: lmacken

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

Modified Files:
	TurboGears.spec 
Added Files:
	TurboGears-1.0.4.2-setuptools.patch 
Removed Files:
	TurboGears-1.0.3.2-paginate.patch 
	TurboGears-1.0.3.2-setuptools.patch 
Log Message:
Remove old patches, and update our setuptools patch to work with the new CherryPy egg_info


TurboGears-1.0.4.2-setuptools.patch:

--- NEW FILE TurboGears-1.0.4.2-setuptools.patch ---
--- setup.py.orig	2008-01-23 10:50:49.000000000 -0500
+++ setup.py	2008-01-23 10:51:26.000000000 -0500
@@ -14,9 +14,7 @@
 # setup params
 install_requires = [
     "CherryPy >= 2.3.0,<3.0.0alpha",
-    "ConfigObj >= 4.3.2",
     "DecoratorTools >= 1.4",
-    "FormEncode >= 0.7.1",
     "PasteScript >= 0.9.7,<1.6",
     "RuleDispatch >= 0.5a0.dev-r2303",
     "setuptools >= 0.6c2",
@@ -57,10 +55,6 @@
 
 # python 2.5 compatible list
 if sys.version_info < (2, 5):
-    install_requires.extend([
-        "elementtree >= 1.2.6",
-        "cElementTree >= 1.0.5",
-        ])
     tgtesttools.extend([
         "pysqlite"
         ])


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- TurboGears.spec	23 Jan 2008 00:21:15 -0000	1.28
+++ TurboGears.spec	23 Jan 2008 17:25:45 -0000	1.29
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -23,9 +23,9 @@
 %endif
 
 %if 0%{?fedora} >= 9
-Requires:       python-cherrypy
-%else
 Requires:       python-cherrypy2
+%else
+Requires:       python-cherrypy
 %endif
 
 Requires:       python-sqlalchemy
@@ -84,6 +84,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Wed Jan 23 2008 Luke Macken <lmacken at redhat.com> 1.0.4.2-2
+- Update setuptools patch to work with the CherryPy egg_info
+
 * Tue Jan 22 2008 Luke Macken <lmacken at redhat.com> 1.0.4.2-1
 - 1.0.4.2
 


--- TurboGears-1.0.3.2-paginate.patch DELETED ---


--- TurboGears-1.0.3.2-setuptools.patch DELETED ---