[openstack-nova/el6] use parallel installed versions of python-routes and paste-deploy

[Pádraig Brady]

commit 496559ada0b2dad3b2ff4a51b06508d6da94a237
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Apr 25 11:23:23 2012 +0100

    use parallel installed versions of python-routes and paste-deploy

 openstack-nova-newdeps.patch |   14 +++++++++++---
 openstack-nova.spec          |   13 ++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/openstack-nova-newdeps.patch b/openstack-nova-newdeps.patch
index cc96695..9f55c45 100644
--- a/openstack-nova-newdeps.patch
+++ b/openstack-nova-newdeps.patch
@@ -1,7 +1,7 @@
 diff -Naur nova-2012.1.orig/nova/__init__.py nova-2012.1/nova/__init__.py
---- nova-2012.1.orig/nova/__init__.py	2012-04-02 00:45:02.505117835 +0000
-+++ nova-2012.1/nova/__init__.py	2012-04-02 00:47:49.348207780 +0000
-@@ -31,6 +31,29 @@
+--- nova-2012.1.orig/nova/__init__.py	2012-04-25 10:16:25.104877188 +0000
++++ nova-2012.1/nova/__init__.py	2012-04-25 10:18:12.504028632 +0000
+@@ -31,6 +31,37 @@
  .. moduleauthor:: Andy Smith <andy at anarkystic.com>
  """
  
@@ -26,6 +26,14 @@ diff -Naur nova-2012.1.orig/nova/__init__.py nova-2012.1/nova/__init__.py
 +
 +replace_dist("WebOb >= 1.0")
 +replace_dist("SQLAlchemy >= 0.6.3")
++replace_dist("Routes >= 1.12.3")
++
++replace_dist("PasteDeploy >= 1.5.0")
++# This hack is needed because replace_dist() results in
++# the standard paste module path being at the start of __path__.
++# TODO: See can we get pkg_resources to do the right thing directly
++import paste
++paste.__path__.insert(0, paste.__path__.pop(-1))
 +
 +
  import gettext
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 656ffef..7d35e04 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2012.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -60,7 +60,7 @@ BuildRequires:    python-lockfile
 Requires:         python-nova = %{version}-%{release}
 
 Requires:         python-paste
-Requires:         python-paste-deploy
+Requires:         python-paste-deploy1.5
 Requires:         python-setuptools
 
 Requires:         bridge-utils
@@ -120,7 +120,7 @@ Requires:         python-lockfile
 Requires:         python-lxml
 Requires:         python-mox
 Requires:         python-redis
-Requires:         python-routes
+Requires:         python-routes1.12
 Requires:         python-sqlalchemy0.7
 Requires:         python-tornado
 Requires:         python-twisted-core
@@ -130,7 +130,7 @@ Requires:         python-netaddr
 # TODO: remove the following dependency which is minimal
 Requires:         python-glance
 Requires:         python-novaclient
-Requires:         python-paste-deploy
+Requires:         python-paste-deploy1.5
 Requires:         python-migrate
 Requires:         python-ldap
 Requires:         radvd
@@ -165,7 +165,7 @@ BuildRequires:    python-IPy
 BuildRequires:    python-boto
 BuildRequires:    python-eventlet
 BuildRequires:    python-gflags
-BuildRequires:    python-routes
+BuildRequires:    python-routes1.12
 BuildRequires:    python-sqlalchemy0.7
 BuildRequires:    python-tornado
 BuildRequires:    python-twisted-core
@@ -399,6 +399,9 @@ fi
 %endif
 
 %changelog
+* Wed Apr 25 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-3
+- Use parallel installed versions of python-routes and python-paste-deploy
+
 * Thu Apr 19 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-2
 - Sync up with Essex stable branch
 - Support more flexible guest image file injection