rpms/TurboGears/devel TurboGears-1.0.3.2-setuptools.patch, 1.2, 1.3 TurboGears.spec, 1.22, 1.23

[Toshio Ernie Kuratomi (toshio)]

Author: toshio

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

Modified Files:
	TurboGears-1.0.3.2-setuptools.patch TurboGears.spec 
Log Message:
* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-3
- Update setuptools patch to modify quickstart template for compat eggs as well.


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurboGears-1.0.3.2-setuptools.patch	24 Sep 2007 19:59:56 -0000	1.2
+++ TurboGears-1.0.3.2-setuptools.patch	27 Sep 2007 23:51:34 -0000	1.3
@@ -1,6 +1,8 @@
---- 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 @@
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
+@@ -16,34 +16,23 @@ install_requires = [
              "TurboJson >= 0.9.9",
              "TurboCheetah >= 0.9.5",
              "TurboKid >= 1.0.2",
@@ -37,7 +39,7 @@
  
  setup(
      name="TurboGears",
-@@ -127,7 +116,7 @@
+@@ -127,7 +116,7 @@ The latest development version is availa
      extras_require = {
          "exp" : ["TGFastData"],
          "standard" : standard,
@@ -46,3 +48,15 @@
          "testtools" : ["nose >= 0.9.1"],
          "tgtesttools" : tgtesttools,
      },
+Index: turbogears/qstemplates/quickstart/start-+package+.py_tmpl
+===================================================================
+--- turbogears/qstemplates/quickstart/start-+package+.py_tmpl.orig
++++ turbogears/qstemplates/quickstart/start-+package+.py_tmpl
+@@ -1,6 +1,6 @@
+ #!${sys_executable}
++__requires__="TurboGears"
+ import pkg_resources
+-pkg_resources.require("TurboGears")
+ 
+ from turbogears import config, update_config, start_server
+ import cherrypy


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TurboGears.spec	24 Sep 2007 19:59:56 -0000	1.22
+++ TurboGears.spec	27 Sep 2007 23:51:34 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -27,8 +27,17 @@
 Requires: python-elementtree >= 1.2.6
 %endif
 
-Requires:       python-kid >= 0.8
+# The main packages have gone up a version.  Need to require the older versions
+#Not reviewed yet, cannot require until then
+#%if 0%{?fedora} >= 8
+#Requires:       python-cherrypy2 >= 2.2.1
+#Requires:       python-sqlalchemy0.3
+#%else
 Requires:       python-cherrypy >= 2.2.1
+Requires:       python-sqlalchemy >= 0.3
+#%endif
+
+Requires:       python-kid >= 0.8
 Requires:       python-sqlobject >= 0.8
 Requires:       python-formencode >= 0.7.1
 Requires:       python-json >= 3.3
@@ -84,6 +93,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Thu Sep 27 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-3
+- Update setuptools patch to modify quickstart template for compat eggs as well.
+
 * Mon Sep 24 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-2
 - Update setuptools patch to "fix" CherryPy dependency error