rpms/TurboGears/devel TurboGears-1.0.4.4-cherrypyreq.patch, NONE, 1.1 TurboGears.spec, 1.36, 1.37

Luke Macken (lmacken) fedora-extras-commits at redhat.com
Tue Mar 11 17:18:40 UTC 2008


Author: lmacken

Update of /cvs/pkgs/rpms/TurboGears/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31433

Modified Files:
	TurboGears.spec 
Added Files:
	TurboGears-1.0.4.4-cherrypyreq.patch 
Log Message:
- Add TurboGears-1.0.4.4-cherrypyreq.patch to explicitly require the
  appropriate version of CherryPy when necessary.


TurboGears-1.0.4.4-cherrypyreq.patch:

--- NEW FILE TurboGears-1.0.4.4-cherrypyreq.patch ---
--- turbogears/config.py.orig	2008-03-11 11:50:04.000000000 -0400
+++ turbogears/config.py	2008-03-11 11:50:22.000000000 -0400
@@ -1,8 +1,8 @@
 import sys, os, glob, re
-
+import pkg_resources
+pkg_resources.require("CherryPy<3.0")
 from cherrypy import config
 from configobj import ConfigObj
-import pkg_resources
 import logging
 import logging.handlers
 


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/devel/TurboGears.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- TurboGears.spec	8 Mar 2008 01:03:35 -0000	1.36
+++ TurboGears.spec	11 Mar 2008 17:18:08 -0000	1.37
@@ -3,13 +3,15 @@
 
 Name:           TurboGears
 Version:        1.0.4.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://www.turbogears.org
 Source0:        http://pypi.python.org/packages/source/T/%{name}/%{name}-%{version}.tar.gz
+Patch0:         %{name}-%{version}-cherrypyreq.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -63,6 +65,7 @@
 
 %prep
 %setup -q
+%patch0 -b .cherrypyreq
 
 
 %build
@@ -84,6 +87,10 @@
 %{python_sitelib}/turbogears/
 
 %changelog
+* Tue Mar 11 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-2
+- Add TurboGears-1.0.4.4-cherrypyreq.patch to explicitly require the
+  appropriate version of CherryPy when necessary.
+
 * Fri Mar  7 2008 Luke Macken <lmacken at redhat.com> 1.0.4.4-1
 - Update to 1.0.4.4
 - Remove the setuptools and sqlalchemy-backport patches




More information about the fedora-extras-commits mailing list