rpms/TurboGears/EL-4 TurboGears-1.0.4.4-cherrypyreq.patch, NONE, 1.1 TurboGears-1.0.4.4-setup.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 TurboGears.spec, 1.27, 1.28 sources, 1.8, 1.9 TurboGears-1.0.3.2-paginate.patch, 1.1, NONE TurboGears-1.0.3.2-setuptools.patch, 1.4, NONE

[Luke Macken]

Author: lmacken

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

Modified Files:
	.cvsignore TurboGears.spec sources 
Added Files:
	TurboGears-1.0.4.4-cherrypyreq.patch 
	TurboGears-1.0.4.4-setup.patch 
Removed Files:
	TurboGears-1.0.3.2-paginate.patch 
	TurboGears-1.0.3.2-setuptools.patch 
Log Message:
- Make our SQLObject requirement less strict, to match the latest TG upstream.
  Fixes bug #459268.



TurboGears-1.0.4.4-cherrypyreq.patch:

--- NEW FILE TurboGears-1.0.4.4-cherrypyreq.patch ---
--- turbogears/config.py.orig	2008-03-11 11:50:04.000000000 -0400
+++ turbogears/config.py	2008-03-11 11:50:22.000000000 -0400
@@ -1,8 +1,8 @@
 import sys, os, glob, re
-
+import pkg_resources
+pkg_resources.require("CherryPy<3.0")
 from cherrypy import config
 from configobj import ConfigObj
-import pkg_resources
 import logging
 import logging.handlers
 

TurboGears-1.0.4.4-setup.patch:

--- NEW FILE TurboGears-1.0.4.4-setup.patch ---
--- 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 = [
     "CherryPy >= 2.3.0,<3.0.0alpha",
-    "ConfigObj >= 4.3.2",
     "DecoratorTools >= 1.4",
     "FormEncode >= 0.7.1",
     "PasteScript >= 1.6.2",
@@ -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):
-    install_requires.extend([
-        "elementtree >= 1.2.6",
-        "cElementTree >= 1.0.5",
-        ])
     tgtesttools.extend([
         "pysqlite"
         ])


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Sep 2007 20:36:29 -0000	1.8
+++ .cvsignore	24 Aug 2008 23:58:20 -0000	1.9
@@ -1 +1 @@
-TurboGears-1.0.3.2.tar.gz
+TurboGears-1.0.4.4.tar.gz


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-4/TurboGears.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- TurboGears.spec	18 Dec 2007 15:18:03 -0000	1.27
+++ TurboGears.spec	24 Aug 2008 23:58:20 -0000	1.28
@@ -2,52 +2,43 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.3.2
-Release:        7%{?dist}
+Version:        1.0.4.4
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org
-Source0:        http://files.turbogears.org/eggs/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-setuptools.patch
-Patch1:         %{name}-%{version}-paginate.patch
+Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
+Patch0:         %{name}-%{version}-cherrypyreq.patch
+Patch1:         %{name}-%{version}-setup.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires: python-devel python-setuptools-devel
-
-# ElementTree is part of python 2.5 on FC7+
-%if 0%{?fedora} <= 6
+BuildRequires:  python-devel python-setuptools-devel
 BuildRequires:  python-elementtree >= 1.2.6
-Requires: python-elementtree >= 1.2.6
-%endif
-
-# The main packages have gone up a version.  Need to require the older versions
-%if 0%{?fedora} >= 8
-Requires:       python-sqlalchemy0.3
-%else
-Requires:       python-sqlalchemy >= 0.3
-%endif
-
-Requires:       python-cherrypy >= 2.2.1
 
+Requires:       python-elementtree >= 1.2.6
+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
-Requires:       python-turbocheetah >= 0.9.5
-Requires:       python-turbojson >= 0.9.9 
-Requires:       python-turbokid >= 1.0.1
+Requires:       python-turbocheetah >= 1.0
+Requires:       python-turbojson >= 1.1.2
+Requires:       python-turbokid >= 1.0.4
 Requires:       python-tgfastdata
 Requires:       python-simplejson >= 1.3
-Requires:       python-paste-script >= 0.9.7
+Requires:       python-paste-script >= 1.6.2
 Requires:       python-configobj >= 4.3.2
 Requires:       python-ruledispatch
 Requires:       python-nose >= 0.9.1
 Requires:       python-psycopg2
 Requires:       python-decoratortools >= 1.4
+Requires:       python-genshi >= 0.4.4
 
 %description
 TurboGears brings together four major pieces to create an
@@ -65,8 +56,8 @@
 
 %prep
 %setup -q
-%patch0 -b .setuptools
-%patch1 -b .paginate
+%patch0 -b .cherrypyreq
+%patch1 -b .setup
 
 
 %build
@@ -74,7 +65,7 @@
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 
 %clean
@@ -88,6 +79,15 @@
 %{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
+- Add cherrypyreq patch
+
 * Sat Dec 15 2007 Luke Macken <lmacken at redhat.com> 1.0.3.2-7
 - Add TurboGears-1.0.3.2-paginate.patch backported from upstream
   http://trac.turbogears.org/ticket/1629


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Sep 2007 20:36:29 -0000	1.8
+++ sources	24 Aug 2008 23:58:20 -0000	1.9
@@ -1 +1 @@
-75471c1767af970479ca2d4788a30323  TurboGears-1.0.3.2.tar.gz
+a03a66fcf7d687fd7bd4205a01fd21dd  TurboGears-1.0.4.4.tar.gz


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


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