[TurboGears] Merge EL-5 Require changes back in

Mark Chappell tremble at fedoraproject.org
Thu Sep 16 16:19:23 UTC 2010


commit cb8200d105d88c39165a208802ed6a0d8256ce14
Author: Mark Chappell <tremble at fedoraproject.org>
Date:   Thu Sep 16 18:10:38 2010 +0200

    Merge EL-5 Require changes back in

 TurboGears.spec |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/TurboGears.spec b/TurboGears.spec
index 67933b2..4e50677 100644
--- a/TurboGears.spec
+++ b/TurboGears.spec
@@ -2,7 +2,7 @@
 
 Name:           TurboGears
 Version:        1.0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -34,12 +34,16 @@ 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
 
-Requires:       python-sqlalchemy
+# EPEL-5 shipped < 0.3.10 originally
+Requires:       python-sqlalchemy >= 0.3.10
 Requires:       python-kid >= 0.8
 Requires:       python-sqlobject >= 0.8
 Requires:       python-formencode >= 0.7.1
@@ -51,7 +55,8 @@ Requires:       python-tgfastdata
 Requires:       python-simplejson >= 1.3
 Requires:       python-paste-script >= 1.6.2
 Requires:       python-configobj >= 4.3.2
-Requires:       python-ruledispatch
+# First version shipped by EPEL-5 that provides what we need
+Requires:       python-ruledispatch >= 0.5a0-0.8.svnr2306
 Requires:       python-nose >= 0.9.1
 Requires:       python-psycopg2
 Requires:       python-decoratortools >= 1.4
@@ -105,6 +110,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* 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
 


More information about the scm-commits mailing list