X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSOURCES%2F0001-use-parallel-installed-versions-in-RHEL6.patch;h=0693890b35b74f5ef55735b236ffc4ec4b033da5;hb=30a9554653185df20feb9c71db5b3c5bd3da3092;hp=7e668fd5147240fcd1f43b1609d9512c60018393;hpb=2dd62a121c7d2565bd357d59e1e598a825abb966;p=openstack-build%2Fneutron-build.git diff --git a/rpm/SOURCES/0001-use-parallel-installed-versions-in-RHEL6.patch b/rpm/SOURCES/0001-use-parallel-installed-versions-in-RHEL6.patch index 7e668fd51..0693890b3 100644 --- a/rpm/SOURCES/0001-use-parallel-installed-versions-in-RHEL6.patch +++ b/rpm/SOURCES/0001-use-parallel-installed-versions-in-RHEL6.patch @@ -1,20 +1,20 @@ -From 1e3dd04afbfa4f29b2a43acf4075117b12fcad5e Mon Sep 17 00:00:00 2001 +From 51ccb186c88ad108eb5e9f808d987c068ac5ecc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Fri, 13 Apr 2012 17:24:40 +0100 Subject: [PATCH] use parallel installed versions in RHEL6 -of webob sqlalchemy python-routes and paste-deploy +of webob sqlalchemy python-routes paste-deploy python-jinja2-26 Change-Id: I290f56eae61c87893639a9e5d29f7fff760452cf --- - neutron/__init__.py | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) + neutron/__init__.py | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) diff --git a/neutron/__init__.py b/neutron/__init__.py -index b2c81bd..764eee4 100644 +index b2c81bd..fef4d32 100644 --- a/neutron/__init__.py +++ b/neutron/__init__.py -@@ -15,6 +15,36 @@ +@@ -15,6 +15,37 @@ # License for the specific language governing permissions and limitations # under the License. @@ -37,9 +37,10 @@ index b2c81bd..764eee4 100644 + # and the associated pkg_resources.working_set.entries + return pkg_resources.require(requirement) + -+replace_dist("WebOb >= 1.0") ++replace_dist("WebOb >= 1.2") +replace_dist("SQLAlchemy >= 0.6.3") +replace_dist("Routes >= 1.12.3") ++replace_dist("Jinja2 >= 2.6") + +replace_dist("PasteDeploy >= 1.5.0") +# This hack is needed because replace_dist() results in