[TurboGears/f14/master: 17/17] Merge branch 'master' into f14 - Changes to allow the package to run on RHEL6 once python-tubojson1.

Tue Jan 18 00:28:09 UTC 2011

commit 5e7ddfed00df1945d279116e4f04b02e82102362
Merge: 65fa9ff 0d00b56
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Jan 17 16:27:30 2011 -0800

    Merge branch 'master' into f14
    - Changes to allow the package to run on RHEL6 once python-tubojson1.3
      is reviewed
    
    Conflicts:
    	turbogears-feed.patch

 .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, 128 insertions(+), 64 deletions(-)
---
diff --cc TurboGears-old-turbokid.patch
index 0000000,0000000..3533d65
new file mode 100644

--- /dev/null
+++ b/TurboGears-old-turbokid.patch
@@@ -1,0 -1,0 +1,13 @@@
++Index: TurboGears-1.1.2/setup.py
++===================================================================
++--- TurboGears-1.1.2.orig/setup.py
+++++ TurboGears-1.1.2/setup.py
++@@ -24,7 +24,7 @@ install_requires = [
++     "setuptools >= 0.6c11",
++     "simplejson >= 1.9.1",
++     "TurboJson >= 1.3",
++-    "TurboKid >= 1.0.5", # needed as engine for widget templates
+++    "TurboKid >= 1.0.4", # needed as engine for widget templates
++     "tgMochiKit >= 1.4.2",
++ ]
++ 
diff --cc TurboGears.spec
index 67933b2,4bf85db..c53e826
--- a/TurboGears.spec
+++ b/TurboGears.spec
@@@ -1,8 -1,10 +1,10 @@@
+ %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.0.9
- Release:        6%{?dist}
+ Version:        1.1.2
 -Release:        1%{?dist}
++Release:        2%{?dist}
  Summary:        Back-to-front web development in Python
  
  Group:          Development/Languages
@@@ -10,64 -12,77 +12,96 @@@ License:        MI
  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
- Patch4: turbogears-sqlcreate.patch
- Patch5: turbogears-deprecation.patch
- # Backport of patch to test suite for SA-0.6
- Patch6: turbogears-sa0.6.patch
+ 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
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildArch:      noarch
  
- 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
+ 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-turbojson
+ BuildRequires: python-tgmochikit
 -BuildRequires: python-turbokid
+ 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
  
  %if 0%{?fedora} || 0%{?rhel} > 5
  Requires:       python-cherrypy2
  BuildRequires:  python-cherrypy2
  %else
  BuildRequires:  python-elementtree >= 1.2.6
- BuildRequires:  python-cherrypy
+ # 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
  Requires:       python-elementtree >= 1.2.6
- Requires:       python-cherrypy
+ 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
 +%endif
  
- 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-sqlobject >= 0.10.1
+ Requires:       python-formencode >= 1.2.1
+ Requires:       python-setuptools >= 0.6c11
  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 >= 1.6.2
 -Requires:       python-turbojson >= 1.2.1
 -Requires:       python-turbokid >= 1.0.5
+ Requires:       python-simplejson >= 1.9.1
+ Requires:       python-paste-script >= 1.7
  Requires:       python-configobj >= 4.3.2
- Requires:       python-ruledispatch
- Requires:       python-nose >= 0.9.1
+ Requires:       python-nose >= 0.9.3
  Requires:       python-psycopg2
- Requires:       python-decoratortools >= 1.4
- Requires:       python-elixir >= 0.4.0
+ Requires:       python-elixir >= 0.6.1
  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,
- Kid for templates in Python) to the controllers (CherryPy) to
- the back end (SQLObject).
+ 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).
  
- 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.
  
@@@ -75,11 -90,8 +109,11 @@@
  %prep
  %setup -q
  %patch0 -b .cherrypyreq
- %patch1 -b .setup
- %patch3 -p0 -b .feedkid
- %patch4 -p1 -b .sqlcreate
- %patch5 -p1 -b .depr
- %patch6 -p1 -b sa0.6
+ %patch1 -p1 -b .sqlcreate
+ %patch2 -p1 -b .feed
++%if 0%{?rhel} && 0%{?rhel} > 6
++%patch100 -p1 -b .deps
++%endif
  
  %build
  %{__python} setup.py build
@@@ -105,6 -117,18 +139,21 @@@ 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
  
