[TurboGears] - Changes to allow the package to run on RHEL6.

[Toshio くらとみ]

commit 764b7049680019076cb21e8ac20892f1c8743c9c
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Jan 17 17:27:13 2011 -0800

    - Changes to allow the package to run on RHEL6.

 TurboGears-1.0.8-setup.patch       |   21 -------------
 TurboGears-old-turbokid.patch      |   13 ++++++++
 TurboGears.spec                    |   32 +++++++++++++++++---
 turbogears-deprecation.patch       |   57 ------------------------------------
 turbogears-js-mime-type-test.patch |   14 ---------
 5 files changed, 40 insertions(+), 97 deletions(-)
---
diff --git a/TurboGears-old-turbokid.patch b/TurboGears-old-turbokid.patch
new file mode 100644
index 0000000..3533d65
--- /dev/null
+++ b/TurboGears-old-turbokid.patch
@@ -0,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 --git a/TurboGears.spec b/TurboGears.spec
index 4bf85db..c896573 100644
--- a/TurboGears.spec
+++ b/TurboGears.spec
@@ -4,7 +4,7 @@
 
 Name:           TurboGears
 Version:        1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -15,6 +15,9 @@ Patch0:         %{name}-1.0.8-cherrypyreq.patch
 # 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -27,9 +30,7 @@ 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
@@ -52,13 +53,28 @@ BuildRequires:	python-cherrypy >= 2.3.0
 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
+BuildRequires: python-turbokid >= 1.0.5
+Requires:       python-turbokid >= 1.0.5
+%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
+# 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-sqlobject >= 0.10.1
 Requires:       python-formencode >= 1.2.1
 Requires:       python-setuptools >= 0.6c11
 Requires:       python-turbocheetah >= 1.0
-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
@@ -92,6 +108,9 @@ TurboGears is easy to use for a wide range of web applications.
 %patch0 -b .cherrypyreq
 %patch1 -p1 -b .sqlcreate
 %patch2 -p1 -b .feed
+%if 0%{?rhel} && 0%{?rhel} > 6
+%patch100 -p1 -b .deps
+%endif
 
 %build
 %{__python} setup.py build
@@ -117,6 +136,9 @@ 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)