rpms/TurboGears/EL-5 TurboGears-1.0.8-setup.patch, 1.1, 1.2 TurboGears.spec, 1.22, 1.23

[Luke Macken]

Author: lmacken

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

Modified Files:
	TurboGears-1.0.8-setup.patch TurboGears.spec 
Log Message:
Update our setup.py patch to work with the 0.9 branch of SQLObject

TurboGears-1.0.8-setup.patch:

Index: TurboGears-1.0.8-setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears-1.0.8-setup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurboGears-1.0.8-setup.patch	4 Mar 2009 03:12:37 -0000	1.1
+++ TurboGears-1.0.8-setup.patch	7 Mar 2009 23:34:24 -0000	1.2
@@ -1,14 +1,12 @@
-Index: setup.py
-===================================================================
---- setup.py.orig
-+++ setup.py
+--- setup.py.orig	2009-03-07 17:39:25.000000000 -0500
++++ setup.py	2009-03-07 17:47:10.000000000 -0500
 @@ -1,5 +1,3 @@
 -from ez_setup import use_setuptools
 -use_setuptools()
  from setuptools import setup, find_packages
  from pkg_resources import DistributionNotFound
  
-@@ -14,7 +12,6 @@ execfile(os.path.join("turbogears", "rel
+@@ -14,7 +12,6 @@
  # setup params
  install_requires = [
      "CherryPy >= 2.3.0, < 3.0.0alpha",
@@ -16,12 +14,22 @@
      "DecoratorTools >= 1.4",
      "FormEncode >= 0.7.1",
      "PasteScript >= 1.6.2",
-@@ -23,7 +20,7 @@ install_requires = [
+@@ -22,8 +19,7 @@
+     "setuptools >= 0.6c2",
      "simplejson >= 1.3",
      "TurboCheetah >= 1.0",
-     # TurboJson >= 1.2 uses PEAK-Rules
+-    # TurboJson >= 1.2 uses PEAK-Rules
 -    "TurboJson >= 1.1.4, < 1.2",
 +    "TurboJson >= 1.1.4",
      "TurboKid >= 1.0.4",
  ]
  
+@@ -35,7 +31,7 @@
+ ]
+ 
+ sqlobject = [
+-    "SQLObject >= 0.10.1",
++    "SQLObject >= 0.9.7",
+ ]
+ 
+ if sys.version_info < (2, 4):


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TurboGears.spec	4 Mar 2009 03:16:28 -0000	1.22
+++ TurboGears.spec	7 Mar 2009 23:34:25 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -93,6 +93,9 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Sat Mar 07 2009 Luke Macken <lmacken at redhat.com> 1.0.8-3
+- Update our setup.py patch to work with the 0.9 branch of SQLObject
+
 * Tue Mar 3 2009 Toshio Kuratomi <toshio at fedoraproject.org> 1.0.8-2
 - Add the correct patches to cvs