rpms/TurboGears/EL-5 TurboGears-1.0.4.4-setup.patch, 1.1, 1.2 TurboGears.spec, 1.19, 1.20

[Luke Macken]

Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7711

Modified Files:
	TurboGears-1.0.4.4-setup.patch TurboGears.spec 
Log Message:
- Make our SQLObject requirement less strict, to match the latest TG upstream.
  Fixes bug #459268.



TurboGears-1.0.4.4-setup.patch:

Index: TurboGears-1.0.4.4-setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears-1.0.4.4-setup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurboGears-1.0.4.4-setup.patch	15 May 2008 15:24:19 -0000	1.1
+++ TurboGears-1.0.4.4-setup.patch	24 Aug 2008 23:56:07 -0000	1.2
@@ -1,5 +1,5 @@
---- setup.py.setup	2008-03-03 16:30:58.000000000 -0500
-+++ setup.py	2008-05-14 22:00:26.000000000 -0400
+--- setup.py.orig	2008-03-03 16:30:58.000000000 -0500
++++ setup.py	2008-08-18 11:41:05.000000000 -0400
 @@ -14,7 +14,6 @@
  # setup params
  install_requires = [
@@ -8,7 +8,25 @@
      "DecoratorTools >= 1.4",
      "FormEncode >= 0.7.1",
      "PasteScript >= 1.6.2",
-@@ -57,10 +56,6 @@
+@@ -33,14 +32,9 @@
+     "Genshi>=0.4.4",
+ ]
+ 
+-if sys.version_info < (2, 5):
+-    sqlobject = [
+-        "SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99",
+-    ]
+-else:
+-    sqlobject = [
+-        "SQLObject>=0.8,<=0.10.0"
+-    ]
++sqlobject = [
++    "SQLObject>=0.7.1"
++]
+ 
+ sqlalchemy = [
+     "SQLAlchemy >= 0.3.10",
+@@ -57,10 +51,6 @@
  
  # python 2.5 compatible list
  if sys.version_info < (2, 5):


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TurboGears.spec	15 May 2008 15:24:19 -0000	1.19
+++ TurboGears.spec	24 Aug 2008 23:56:07 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -23,7 +23,7 @@
 Requires:       python-cherrypy
 Requires:       python-sqlalchemy
 Requires:       python-kid >= 0.8
-Requires:       python-sqlobject >= 0.8
+Requires:       python-sqlobject >= 0.7.1
 Requires:       python-formencode >= 0.7.1
 Requires:       python-json >= 3.3
 Requires:       python-setuptools >= 0.6c2
@@ -80,6 +80,10 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Aug 18 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-2
+- Make our SQLObject requirement less strict, to match the latest TG upstream.
+  Fixes bug #459268.
+
 * Wed May 14 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-1
 - Update to 1.0.4.4
 - Remove now upstream paginate patch