rpms/TurboGears/devel TurboGears-1.0.3.2-setuptools.patch, 1.3, 1.4 TurboGears.spec, 1.24, 1.25

[Toshio Ernie Kuratomi (toshio)]

Author: toshio

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

Modified Files:
	TurboGears-1.0.3.2-setuptools.patch TurboGears.spec 
Log Message:
* Mon Oct 8 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-5
- Update patch so that quickstart template pulls in the proper sqlalchemy
  when tg-admin quickstart -s is run.


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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TurboGears-1.0.3.2-setuptools.patch	27 Sep 2007 23:51:34 -0000	1.3
+++ TurboGears-1.0.3.2-setuptools.patch	8 Oct 2007 18:35:47 -0000	1.4
@@ -52,11 +52,21 @@
 ===================================================================
 --- turbogears/qstemplates/quickstart/start-+package+.py_tmpl.orig
 +++ turbogears/qstemplates/quickstart/start-+package+.py_tmpl
-@@ -1,6 +1,6 @@
+@@ -1,6 +1,10 @@
  #!${sys_executable}
++#if $sqlalchemy != "True"
 +__requires__="TurboGears"
++#else 
++__requires__="TurboGears[future]"
++#end if
  import pkg_resources
 -pkg_resources.require("TurboGears")
  
  from turbogears import config, update_config, start_server
  import cherrypy
+@@ -22,5 +26,4 @@ else:
+ config.update(dict(package="${package}"))
+ 
+ from ${package}.controllers import Root
+-
+ start_server(Root())


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TurboGears.spec	6 Oct 2007 00:11:13 -0000	1.24
+++ TurboGears.spec	8 Oct 2007 18:35:47 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -92,6 +92,10 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Oct 8 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-5
+- Update patch so that quickstart template pulls in the proper sqlalchemy
+  when tg-admin quickstart -s is run.
+
 * Fri Oct 5 2007 Toshio Kuratomi <a.badger at gmail.com> 1.0.3.2-4
 - Require sqlalchemy 0.3.