Update RPM specs to v. 2014.1.1

[openstack-build/neutron-build.git] / rpm / SOURCES / 0001-use-parallel-installed-versions-in-RHEL6.patch

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 7e61ab7578b317abe0ae1a56125bf5b382de09c6..0693890b35b74f5ef55735b236ffc4ec4b033da5 100644 (file)
--- 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 a62cd977bcf59cfd6b40cfc607364ab698443b85 Mon Sep 17 00:00:00 2001
+From 51ccb186c88ad108eb5e9f808d987c068ac5ecc5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
 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
 ---
- quantum/__init__.py |   30 ++++++++++++++++++++++++++++++
- 1 files changed, 30 insertions(+), 0 deletions(-)
+ neutron/__init__.py | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
 
-diff --git a/quantum/__init__.py b/quantum/__init__.py
-index 25ce3af..eb5a3fa 100644
---- a/quantum/__init__.py
-+++ b/quantum/__init__.py
-@@ -15,6 +15,36 @@
+diff --git a/neutron/__init__.py b/neutron/__init__.py
+index b2c81bd..fef4d32 100644
+--- a/neutron/__init__.py
++++ b/neutron/__init__.py
+@@ -15,6 +15,37 @@
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
@@ -37,9 +37,10 @@ index 25ce3af..eb5a3fa 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