[TurboGears2/epel7] Remove turbojson and turbokid requirements

[Toshio くらとみ]

commit e4a30b6b58900c337cd971b03a407dac26068820
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Jun 20 09:39:18 2014 -0700

    Remove turbojson and turbokid requirements

 TurboGears2-no-turbojson-turbokid.patch |   46 +++++++++++++++++++++++++++++++
 TurboGears2.spec                        |   15 +++++++---
 2 files changed, 56 insertions(+), 5 deletions(-)
---
diff --git a/TurboGears2-no-turbojson-turbokid.patch b/TurboGears2-no-turbojson-turbokid.patch
new file mode 100644
index 0000000..7a49b03
--- /dev/null
+++ b/TurboGears2-no-turbojson-turbokid.patch
@@ -0,0 +1,46 @@
+Index: TurboGears2-2.3.0dev/setup.cfg
+===================================================================
+--- TurboGears2-2.3.0dev.orig/setup.cfg
++++ TurboGears2-2.3.0dev/setup.cfg
+@@ -1,7 +1,7 @@
+ [aliases]
+ release = egg_info -RDb "" sdist bdist_egg register upload
+ tgdevelop = develop -i http://tg.gy/230
+-tgtesting = easy_install -i http://tg.gy/230 AddOns BytecodeAssembler Chameleon coverage DecoratorTools Extremes Genshi Jinja2 Kajiki kid multiprocessing nose PEAK_Rules repoze.tm2 repoze.who repoze.who_friendlyform repoze.who.plugins.sa simplegeneric sprox SQLAlchemy SymbolType tgext.admin tgext.crud ToscaWidgets transaction TurboJson TurboKid tw.forms zope.interface zope.sqlalchemy tw2.forms tw2.core speaklater
++tgtesting = easy_install -i http://tg.gy/230 AddOns BytecodeAssembler Chameleon coverage DecoratorTools Extremes Genshi Jinja2 Kajiki kid multiprocessing nose PEAK_Rules repoze.tm2 repoze.who repoze.who_friendlyform repoze.who.plugins.sa simplegeneric sprox SQLAlchemy SymbolType tgext.admin tgext.crud ToscaWidgets transaction tw.forms zope.interface zope.sqlalchemy tw2.forms tw2.core speaklater
+ tgrelease = easy_install yolk basketweaver sphinx
+ tgnose = nosetests --with-coverage --cover-erase --cover-package=tg --with-xunit --verbosity=2
+ cover = nosetests --with-coverage
+Index: TurboGears2-2.3.0dev/setup.py
+===================================================================
+--- TurboGears2-2.3.0dev.orig/setup.py
++++ TurboGears2-2.3.0dev/setup.py
+@@ -29,8 +29,7 @@ test_requirements = ['coverage',
+                     ]
+ 
+ if py_version[0] == 2:
+-    test_requirements.extend(['TurboKid >= 1.0.4',
+-                              'Kajiki >= 0.2.2',
++    test_requirements.extend(['Kajiki >= 0.2.2',
+                               'simplegeneric',
+                               'Formencode',
+                               'routes',
+Index: TurboGears2-2.3.0dev/TurboGears2.egg-info/requires.txt
+===================================================================
+--- TurboGears2-2.3.0dev.orig/TurboGears2.egg-info/requires.txt
++++ TurboGears2-2.3.0dev/TurboGears2.egg-info/requires.txt
+@@ -20,7 +20,6 @@ WebTest < 2.0
+ routes
+ backlash
+ sqlalchemy
+-TurboKid >= 1.0.4
+ Kajiki >= 0.2.2
+ Chameleon < 2.0a
+ simplegeneric
+@@ -28,4 +27,4 @@ Formencode
+ routes
+ tgming
+ tw.forms
+-tw2.forms
+\ No newline at end of file
++tw2.forms
diff --git a/TurboGears2.spec b/TurboGears2.spec
index 1760dd8..4bb1456 100644
--- a/TurboGears2.spec
+++ b/TurboGears2.spec
@@ -4,7 +4,7 @@
 
 Name:           TurboGears2
 Version:        2.3.0
-Release:        0.2.git%{git}%{?dist}
+Release:        0.3.git%{git}%{?dist}
 Summary:        Next generation front-to-back web development megaframework
 
 Group:          Development/Languages
@@ -13,12 +13,15 @@ URL:            http://www.turbogears.org
 Source0:        http://www.turbogears.org/2.3/downloads/%{version}/%{name}-%{version}dev.tar.gz
 Patch0:         %{name}-no-chameleon.patch
 Patch1:         %{name}-no-ming.patch
+# turbojson and turbokid are no longer used in code.  Remove from as a dep in
+# the metadata
+Patch2:         %{name}-no-turbojson-turbokid.patch
 
 BuildArch:      noarch
 
-BuildRequires:  python-devel python-setuptools-devel
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 BuildRequires:  python-nose python-coverage
-BuildRequires:  python-turbokid >= 1.0.4
 BuildRequires:  python-zope-sqlalchemy >= 0.4
 BuildRequires:  python-jinja2
 BuildRequires:  python-simplegeneric
@@ -28,7 +31,6 @@ BuildRequires:  python-tw-forms
 BuildRequires:  python-tw2-forms
 BuildRequires:  python-genshi >= 0.5.1
 BuildRequires:  python-mako
-BuildRequires:  python-turbojson >= 1.3
 BuildRequires:  python-webflash
 BuildRequires:  python-kajiki >= 0.2.2
 BuildRequires:  python-repoze-who-plugins-sa >= 1.0.1
@@ -58,7 +60,6 @@ Requires:       python-repoze-who
 Requires:       python-repoze-who-plugins-sa >= 1.0.1
 Requires:       python-mako
 Requires:       python-routes
-Requires:       python-turbokid >= 1.0.4
 Requires:       python-tw-forms
 Requires:       python-tw2-forms
 
@@ -83,6 +84,7 @@ database development and everything in between:
 %setup -q -n %{name}-%{version}dev
 %patch0 -p1 -b .chameleon
 %patch1 -p1 -b .ming
+%patch2 -p1
 
 
 %build
@@ -103,6 +105,9 @@ rm -fr %{buildroot}%{python_sitelib}/tests
 
 
 %changelog
+* Fri Jun 20 2014 Toshio Kuratomi <toshio at fedoraproject.org> - 2.3.0-0.3.git
+- Remove turbojson and turbokid requirements
+
 * Mon Apr  8 2013 Luke Macken <lmacken at redhat.com> - 2.3.0-0.1.git6da6959
 - Update to the latest 2.3 snapshot.