rpms/TurboGears/EL-5 TurboGears-1.0.8-cherrypyreq.patch, NONE, 1.1 TurboGears-1.0.8-setup.patch, NONE, 1.1 TurboGears-1.0.4.4-cherrypyreq.patch, 1.1, NONE TurboGears-1.0.4.4-setup.patch, 1.2, NONE
Toshio くらとみ
toshio at fedoraproject.org
Wed Mar 4 03:12:38 UTC 2009
Author: toshio
Update of /cvs/pkgs/rpms/TurboGears/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32559
Added Files:
TurboGears-1.0.8-cherrypyreq.patch
TurboGears-1.0.8-setup.patch
Removed Files:
TurboGears-1.0.4.4-cherrypyreq.patch
TurboGears-1.0.4.4-setup.patch
Log Message:
Proper versions of patches
TurboGears-1.0.8-cherrypyreq.patch:
--- NEW FILE TurboGears-1.0.8-cherrypyreq.patch ---
--- turbogears/config.py.orig 2008-12-18 16:42:03.000000000 -0500
+++ turbogears/config.py 2008-12-18 16:42:06.000000000 -0500
@@ -1,8 +1,10 @@
import 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
TurboGears-1.0.8-setup.patch:
--- NEW FILE TurboGears-1.0.8-setup.patch ---
Index: setup.py
===================================================================
--- setup.py.orig
+++ setup.py
@@ -1,5 +1,3 @@
-from ez_setup import use_setuptools
-use_setuptools()
from setuptools import setup, find_packages
from pkg_resources import DistributionNotFound
@@ -14,7 +12,6 @@ execfile(os.path.join("turbogears", "rel
# setup params
install_requires = [
"CherryPy >= 2.3.0, < 3.0.0alpha",
- "ConfigObj >= 4.3.2",
"DecoratorTools >= 1.4",
"FormEncode >= 0.7.1",
"PasteScript >= 1.6.2",
@@ -23,7 +20,7 @@ install_requires = [
"simplejson >= 1.3",
"TurboCheetah >= 1.0",
# TurboJson >= 1.2 uses PEAK-Rules
- "TurboJson >= 1.1.4, < 1.2",
+ "TurboJson >= 1.1.4",
"TurboKid >= 1.0.4",
]
--- TurboGears-1.0.4.4-cherrypyreq.patch DELETED ---
--- TurboGears-1.0.4.4-setup.patch DELETED ---
More information about the fedora-extras-commits
mailing list