[TurboGears/f14/master] Revert "Merge branch 'master' into f14"
Toshio くらとみ
toshio at fedoraproject.org
Tue Jan 18 00:59:32 UTC 2011
commit 6dea3e4602ff968541b917c01a4f09a936085149
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Mon Jan 17 16:59:10 2011 -0800
Revert "Merge branch 'master' into f14"
This reverts commit 5e7ddfed00df1945d279116e4f04b02e82102362, reversing
changes made to 65fa9ff1ce06e0309abd207eda9d6f0b5ef9ea9d.
.gitignore | 3 +-
TurboGears-1.0.8-cherrypyreq.patch | 8 +--
TurboGears-old-turbokid.patch | 13 ----
TurboGears.spec | 139 ++++++++++++------------------------
sources | 2 +-
turbogears-feed.patch | 7 +-
turbogears-sqlcreate.patch | 20 +++---
7 files changed, 64 insertions(+), 128 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc77f6d..159bda2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/TurboGears-1.1.1.tar.gz
-/TurboGears-1.1.2.tar.gz
+TurboGears-1.0.9.tar.gz
diff --git a/TurboGears-1.0.8-cherrypyreq.patch b/TurboGears-1.0.8-cherrypyreq.patch
index 4cf4cf8..8e42d72 100644
--- a/TurboGears-1.0.8-cherrypyreq.patch
+++ b/TurboGears-1.0.8-cherrypyreq.patch
@@ -1,7 +1,5 @@
-Index: turbogears/config.py
-===================================================================
---- turbogears/config.py.orig
-+++ turbogears/config.py
+--- turbogears/config.py.orig 2008-12-18 16:42:03.000000000 -0500
++++ turbogears/config.py 2008-12-18 16:42:06.000000000 -0500
@@ -1,8 +1,10 @@
import os, glob, re
@@ -11,6 +9,6 @@ Index: turbogears/config.py
from cherrypy import config
from configobj import ConfigObj
-import pkg_resources
+ import logging
import logging.handlers
- __all__ = ["update_config", "get", "update"]
diff --git a/TurboGears.spec b/TurboGears.spec
index c53e826..67933b2 100644
--- a/TurboGears.spec
+++ b/TurboGears.spec
@@ -1,10 +1,8 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%endif
Name: TurboGears
-Version: 1.1.2
-Release: 2%{?dist}
+Version: 1.0.9
+Release: 6%{?dist}
Summary: Back-to-front web development in Python
Group: Development/Languages
@@ -12,96 +10,64 @@ License: MIT
URL: http://www.turbogears.org
Source0: http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
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
# Reported upstream http://trac.turbogears.org/ticket/2419
-Patch1: turbogears-sqlcreate.patch
-Patch2: turbogears-feed.patch
-# Patch to allow turbogears to work with old turbokid until/unless RHEL6
-# updates
-Patch100: TurboGears-old-turbokid.patch
+Patch4: turbogears-sqlcreate.patch
+Patch5: turbogears-deprecation.patch
+# Backport of patch to test suite for SA-0.6
+Patch6: turbogears-sa0.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: python2-devel
-BuildRequires: python-setuptools
-BuildRequires: python-configobj
-BuildRequires: python-formencode
-BuildRequires: python-genshi
-BuildRequires: python-kid
-BuildRequires: python-paste-script
-BuildRequires: python-peak-rules
-BuildRequires: python-simplejson
-BuildRequires: python-tgmochikit
-BuildRequires: python-turbocheetah
-BuildRequires: python-sqlobject
-BuildRequires: python-sqlalchemy
-BuildRequires: python-elixir
-BuildRequires: python-toscawidgets
-BuildRequires: python-tw-forms
-BuildRequires: python-nose
-BuildRequires: python-webtest
-BuildRequires: python-dateutil
+BuildRequires: python-devel python-setuptools-devel
+
+BuildRequires: python-nose python-configobj python-ruledispatch
+BuildRequires: python-decoratortools python-turbojson python-simplejson python-kid
+BuildRequires: python-formencode python-turbokid python-turbocheetah
+BuildRequires: python-paste-script python-sqlobject python-sqlalchemy
%if 0%{?fedora} || 0%{?rhel} > 5
Requires: python-cherrypy2
BuildRequires: python-cherrypy2
%else
BuildRequires: python-elementtree >= 1.2.6
-# EPEL-5 shipped < 2.3.0 originally
-# Note there is also a requirement for this to be cherrypy 2, however
-# cherrypy 3 should only turn up as a parallel installable version...
-BuildRequires: python-cherrypy >= 2.3.0
+BuildRequires: python-cherrypy
Requires: python-elementtree >= 1.2.6
-Requires: python-cherrypy >= 2.3.0
-%endif
-%if 0%{?fedora} || 0%{?rhel} > 6
-BuildRequires: python-turbojson >= 1.3
-Requires: python-turbojson >= 1.3
-%else
-# Note: This package is needed until/unless RHEL6 updates to
-# python-turbojson-1.3 or later
-BuildRequires: python-turbojson1.3
-Requires: python-turbojson1.3
-%endif
-%if 0%{?fedora} || 0%{?rhel} > 6
-BuildRequires: python-turbokid >= 1.0.5
-Requires: python-turbokid >= 1.0.5
-%else
-# Need newer versions of python-turbokid (in RHEL6 base) but:
-# The newer version is to fix a bug where kid templates will not be reloaded
-# when they've changed. That should only affect code that's being developed,
-# not code that's simply being served
-BuildRequires: python-turbokid >= 1.0.4
-Requires: python-turbokid >= 1.0.4
+Requires: python-cherrypy
%endif
-Requires: python-sqlobject >= 0.10.1
-Requires: python-formencode >= 1.2.1
-Requires: python-setuptools >= 0.6c11
+Requires: python-sqlalchemy
+Requires: python-kid >= 0.8
+Requires: python-sqlobject >= 0.8
+Requires: python-formencode >= 0.7.1
+Requires: python-setuptools >= 0.6c2
Requires: python-turbocheetah >= 1.0
-Requires: python-simplejson >= 1.9.1
-Requires: python-paste-script >= 1.7
+Requires: python-turbojson >= 1.1.2
+Requires: python-turbokid >= 1.0.4
+Requires: python-tgfastdata
+Requires: python-simplejson >= 1.3
+Requires: python-paste-script >= 1.6.2
Requires: python-configobj >= 4.3.2
-Requires: python-nose >= 0.9.3
+Requires: python-ruledispatch
+Requires: python-nose >= 0.9.1
Requires: python-psycopg2
-Requires: python-elixir >= 0.6.1
+Requires: python-decoratortools >= 1.4
+Requires: python-elixir >= 0.4.0
Requires: python-genshi >= 0.4.4
-Requires: python-kid
-Requires: python-peak-rules
-Requires: python-tgmochikit
-Requires: python-toscawidgets >= 0.9.6
-Requires: python-tw-forms >= 0.9.6
-Requires: python-webtest
-Requires: python-dateutil
%description
-TurboGears brings together four major pieces to create an easy to install, easy
-to use web megaframework. It covers everything from front end (MochiKit
-JavaScript for the browser, Genshi for templates in Python) to the controllers
-(CherryPy) to the back end (SQLAlchemy).
+TurboGears brings together four major pieces to create an
+easy to install, easy to use web megaframework. It covers
+everything from front end (MochiKit JavaScript for the browser,
+Kid for templates in Python) to the controllers (CherryPy) to
+the back end (SQLObject).
-The TurboGears project is focused on providing documentation and integration
-with these tools without losing touch with the communities that already exist
-around those tools.
+The TurboGears project is focused on providing documentation
+and integration with these tools without losing touch
+with the communities that already exist around those tools.
TurboGears is easy to use for a wide range of web applications.
@@ -109,11 +75,11 @@ TurboGears is easy to use for a wide range of web applications.
%prep
%setup -q
%patch0 -b .cherrypyreq
-%patch1 -p1 -b .sqlcreate
-%patch2 -p1 -b .feed
-%if 0%{?rhel} && 0%{?rhel} > 6
-%patch100 -p1 -b .deps
-%endif
+%patch1 -b .setup
+%patch3 -p0 -b .feedkid
+%patch4 -p1 -b .sqlcreate
+%patch5 -p1 -b .depr
+%patch6 -p1 -b sa0.6
%build
%{__python} setup.py build
@@ -139,21 +105,6 @@ rm -rf %{buildroot}
%{python_sitelib}/turbogears/
%changelog
-* Mon Jan 17 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1.2-2
-- Changes to allow the package to run on RHEL6.
-
-* Sat Dec 25 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1.2-1
-- Update to upstream 1.1.2
-- Add python-dateutil as a a Req (for scheduler)
-
-* Thu Dec 2 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1.1-1
-- Update to upstream 1.1.1
-- Fix test case failure
-- Fix problem with an import not matching what's actually called.
-
-* Thu Sep 16 2010 Mark Chappell <tremble at fedoraproject.org> - 1.0.9-7
-- Add explicit versions to ensure we install cleanly on EL-5 RHBZ#451228
-
* Tue Aug 3 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.9-6
- Fix building on python-2.7
diff --git a/sources b/sources
index 47869e1..da75984 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f338fb58f4fba32f7d481533431527b3 TurboGears-1.1.2.tar.gz
+aa10271f3d29c716e9d63b3264dca944 TurboGears-1.0.9.tar.gz
diff --git a/turbogears-feed.patch b/turbogears-feed.patch
index fe81522..73ca16f 100644
--- a/turbogears-feed.patch
+++ b/turbogears-feed.patch
@@ -1,6 +1,7 @@
-diff -up TurboGears-1.1.1/turbogears/feed/feed.py.bak TurboGears-1.1.1/turbogears/feed/feed.py
---- TurboGears-1.1.1/turbogears/feed/feed.py.bak 2010-12-02 17:06:50.287780420 -0800
-+++ TurboGears-1.1.1/turbogears/feed/feed.py 2010-12-02 12:54:30.501525758 -0800
+Index: TurboGears-1.1.1/turbogears/feed/feed.py
+===================================================================
+--- TurboGears-1.1.1.orig/turbogears/feed/feed.py
++++ TurboGears-1.1.1/turbogears/feed/feed.py
@@ -16,7 +16,7 @@ class FeedController(turbogears.controll
""" Object for generating feeds in multiple formats """
diff --git a/turbogears-sqlcreate.patch b/turbogears-sqlcreate.patch
index 93505c5..831f5c3 100644
--- a/turbogears-sqlcreate.patch
+++ b/turbogears-sqlcreate.patch
@@ -1,13 +1,13 @@
-Index: TurboGears-1.1.1/turbogears/command/base.py
+Index: TurboGears-1.0.9/turbogears/command/base.py
===================================================================
---- TurboGears-1.1.1.orig/turbogears/command/base.py
-+++ TurboGears-1.1.1/turbogears/command/base.py
-@@ -125,11 +125,20 @@ class SQL(CommandWithDB):
+--- TurboGears-1.0.9.orig/turbogears/command/base.py
++++ TurboGears-1.0.9/turbogears/command/base.py
+@@ -127,11 +127,20 @@ class SQL(CommandWithDB):
if not eggname or not os.path.exists(
- os.path.join(eggname[0], 'sqlobject.txt')):
+ os.path.join(eggname[0], "sqlobject.txt")):
eggname = self.fix_egginfo(eggname)
+ # Turn the egg directory name into a package name
- eggname = eggname[0].replace('.egg-info', '')
+ eggname = eggname[0].replace(".egg-info", "")
+ pkgname = '-'.join(eggname.split('-')[:-2])
+ try:
+ # Add the version info with proper syntax if it exists
@@ -16,11 +16,11 @@ Index: TurboGears-1.1.1/turbogears/command/base.py
+ pkgname = eggname
+ else:
+ pkgname = '%s == %s' % (pkgname, pkgversion)
- if not '.' in sys.path:
- sys.path.append('.')
- pkg_resources.working_set.add_entry('.')
+ if not "." in sys.path:
+ sys.path.append(".")
+ pkg_resources.working_set.add_entry(".")
- sys.argv.insert(2, eggname)
+ sys.argv.insert(2, pkgname)
- sys.argv.insert(2, '--egg')
+ sys.argv.insert(2, "--egg")
socommand.the_runner.run(sys.argv)
More information about the scm-commits
mailing list