[openstack-neutron/el6-havana] fix reference to parallel installed python-jinja2-26

[Pádraig Brady]

commit c63c4273ac1b3bc09e657d427eeaba757c4f5da7
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Nov 13 11:04:58 2013 +0000

    fix reference to parallel installed python-jinja2-26
    
    Required by the openstack-neutron-vpn-aqent

 ...-use-parallel-installed-versions-in-RHEL6.patch |   13 +++++++------
 openstack-neutron.spec                             |    5 ++++-
 2 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/0001-use-parallel-installed-versions-in-RHEL6.patch b/0001-use-parallel-installed-versions-in-RHEL6.patch
index 7e668fd..ae2b1d3 100644
--- a/0001-use-parallel-installed-versions-in-RHEL6.patch
+++ b/0001-use-parallel-installed-versions-in-RHEL6.patch
@@ -1,20 +1,20 @@
-From 1e3dd04afbfa4f29b2a43acf4075117b12fcad5e Mon Sep 17 00:00:00 2001
+From c7f7a43ab429da21c8dc9f8544b44a6407e37e5a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at 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
 ---
- neutron/__init__.py | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
+ neutron/__init__.py |   31 +++++++++++++++++++++++++++++++
+ 1 files changed, 31 insertions(+), 0 deletions(-)
 
 diff --git a/neutron/__init__.py b/neutron/__init__.py
-index b2c81bd..764eee4 100644
+index b2c81bd..8f09807 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.
  
@@ -40,6 +40,7 @@ index b2c81bd..764eee4 100644
 +replace_dist("WebOb >= 1.0")
 +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
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 2b053c6..d498d28 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -5,7 +5,7 @@
 
 Name:		openstack-neutron
 Version:	2013.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -997,6 +997,9 @@ fi
 
 
 %changelog
+* Wed Nov 13 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-6
+- Fix jinja2 import in openstack-neutron-vpn-agent
+
 * Thu Nov 07 2013 Terry Wilson <twilson at redhat.com> - 2013.2-5
 - Update deps for python-{babel,keystoneclient,oslo-config}