rpms/TurboGears/EL-5 .cvsignore, 1.9, 1.10 TurboGears-1.0.8-setup.patch, 1.2, 1.3 TurboGears.spec, 1.28, 1.29 sources, 1.9, 1.10 turbogears-sqlcreate.patch, 1.1, 1.2

Toshio くらとみ toshio at fedoraproject.org
Tue Dec 1 15:52:49 UTC 2009


Author: toshio

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

Modified Files:
	.cvsignore TurboGears-1.0.8-setup.patch TurboGears.spec 
	sources turbogears-sqlcreate.patch 
Log Message:

* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
- Update to 1.0.9 bugfix release.
- Paginate fix is in upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	4 Mar 2009 02:58:19 -0000	1.9
+++ .cvsignore	1 Dec 2009 15:52:49 -0000	1.10
@@ -1 +1 @@
-TurboGears-1.0.8.tar.gz
+TurboGears-1.0.9.tar.gz

TurboGears-1.0.8-setup.patch:
 setup.py |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- TurboGears-1.0.8-setup.patch	7 Mar 2009 23:34:24 -0000	1.2
+++ TurboGears-1.0.8-setup.patch	1 Dec 2009 15:52:49 -0000	1.3
@@ -1,12 +1,14 @@
---- setup.py.orig	2009-03-07 17:39:25.000000000 -0500
-+++ setup.py	2009-03-07 17:47:10.000000000 -0500
+Index: setup.py
+===================================================================
+--- setup.py.orig
++++ setup.py
 @@ -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 @@
+ import sys
+@@ -20,7 +18,6 @@ execfile(os.path.join("turbogears", "rel
  # setup params
  install_requires = [
      "CherryPy >= 2.3.0, < 3.0.0alpha",
@@ -14,7 +16,7 @@
      "DecoratorTools >= 1.4",
      "FormEncode >= 0.7.1",
      "PasteScript >= 1.6.2",
-@@ -22,8 +19,7 @@
+@@ -28,8 +25,7 @@ install_requires = [
      "setuptools >= 0.6c2",
      "simplejson >= 1.3",
      "TurboCheetah >= 1.0",
@@ -24,12 +26,12 @@
      "TurboKid >= 1.0.4",
  ]
  
-@@ -35,7 +31,7 @@
- ]
- 
- sqlobject = [
--    "SQLObject >= 0.10.1",
-+    "SQLObject >= 0.9.7",
- ]
- 
+@@ -43,7 +39,7 @@ future = [
  if sys.version_info < (2, 4):
+     sqlobject = [
+         # SQLObject >= 0.11 does not support Py 2.3
+-        "SQLObject >= 0.10.1, < 0.11.0alpha",
++        "SQLObject >= 0.9.7, < 0.11.0alpha",
+         ]
+     sqlalchemy = [
+         # SQLAlchemy >= 0.5 does not support Py 2.3


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/TurboGears.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- TurboGears.spec	1 Dec 2009 02:10:17 -0000	1.28
+++ TurboGears.spec	1 Dec 2009 15:52:49 -0000	1.29
@@ -2,18 +2,16 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           TurboGears
-Version:        1.0.8
-Release:        8%{?dist}
+Version:        1.0.9
+Release:        1%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-cherrypyreq.patch
-Patch1:         %{name}-%{version}-setup.patch
-# From upstream changeset r6575
-Patch2:         %{name}-%{version}-paginate.patch
+Patch0:         %{name}-1.0.8-cherrypyreq.patch
+Patch1:         %{name}-1.0.8-setup.patch
 # From upstream bug report: http://trac.turbogears.org/ticket/2348
 # Going into TG-1.1 but not TG-1.0.x
 Patch3: feedkid.diff
@@ -76,7 +74,6 @@ TurboGears is easy to use for a wide ran
 %setup -q
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
-%patch2 -p3 -b .paginate
 %patch3 -p0 -b .feedkid
 %patch4 -p1 -b .sqlcreate
 
@@ -101,6 +98,10 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-1
+- Update to 1.0.9 bugfix release.
+- Paginate fix is in upstream.
+
 * Mon Nov 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-8
 - Fix problem with sql create and sqlobject
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	4 Mar 2009 02:58:19 -0000	1.9
+++ sources	1 Dec 2009 15:52:49 -0000	1.10
@@ -1 +1 @@
-845b29a588ae8d4e7591c7226daa6f98  TurboGears-1.0.8.tar.gz
+aa10271f3d29c716e9d63b3264dca944  TurboGears-1.0.9.tar.gz

turbogears-sqlcreate.patch:
 base.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: turbogears-sqlcreate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/EL-5/turbogears-sqlcreate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- turbogears-sqlcreate.patch	1 Dec 2009 02:10:17 -0000	1.1
+++ turbogears-sqlcreate.patch	1 Dec 2009 15:52:49 -0000	1.2
@@ -1,8 +1,8 @@
-Index: TurboGears-1.0.8/turbogears/command/base.py
+Index: TurboGears-1.0.9/turbogears/command/base.py
 ===================================================================
---- TurboGears-1.0.8.orig/turbogears/command/base.py
-+++ TurboGears-1.0.8/turbogears/command/base.py
-@@ -128,11 +128,15 @@ class SQL(CommandWithDB):
+--- TurboGears-1.0.9.orig/turbogears/command/base.py
++++ TurboGears-1.0.9/turbogears/command/base.py
+@@ -127,11 +127,15 @@ class SQL(CommandWithDB):
                      if not eggname or not os.path.exists(
                              os.path.join(eggname[0], "sqlobject.txt")):
                          eggname = self.fix_egginfo(eggname)
@@ -18,4 +18,4 @@ Index: TurboGears-1.0.8/turbogears/comma
 +                    sys.argv.insert(2, pkgname)
                      sys.argv.insert(2, "--egg")
  
-             command.the_runner.run(sys.argv)
+             socommand.the_runner.run(sys.argv)




More information about the fedora-extras-commits mailing list