[openstack-keystone/el6] use parallel installed version of python-paste-deploy

[Pádraig Brady]

commit 64e707a3079c9c64b29944ea5739d17ed0182d5b
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Apr 26 16:50:17 2012 +0100

    use parallel installed version of python-paste-deploy

 openstack-keystone-newdeps.patch |    9 ++++++++-
 openstack-keystone.spec          |    9 ++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/openstack-keystone-newdeps.patch b/openstack-keystone-newdeps.patch
index e352dc2..1479d35 100644
--- a/openstack-keystone-newdeps.patch
+++ b/openstack-keystone-newdeps.patch
@@ -1,6 +1,6 @@
 --- keystone-2012.1/keystone/__init__.py.newdeps	2012-02-29 11:16:06.000000000 +0100
 +++ keystone-2012.1/keystone/__init__.py	2012-03-01 22:42:08.546503618 +0100
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,28 @@
 +import sys
 +import pkg_resources
 +
@@ -22,3 +22,10 @@
 +
 +replace_dist("WebOb >= 1.0")
 +replace_dist("SQLAlchemy >= 0.6.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))
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index ea8c05a..c14e431 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -11,7 +11,7 @@
 
 Name:           openstack-keystone
 Version:        2012.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 #Release:       0.1.%{release_letter}%{milestone}%{?dist}
 Summary:        OpenStack Identity Service
 
@@ -65,10 +65,10 @@ Requires:       python-lxml
 Requires:       python-memcached
 Requires:       python-migrate
 Requires:       python-paste
-Requires:       python-paste-deploy
+Requires:       python-paste-deploy1.5
 Requires:       python-paste-script
 Requires:       python-prettytable
-Requires:       python-routes
+Requires:       python-routes1.12
 Requires:       python-sqlalchemy0.7
 Requires:       python-webob1.0
 Requires:       python-passlib
@@ -200,6 +200,9 @@ fi
 %{python_sitelib}/keystone-%{version}-*.egg-info
 
 %changelog
+* Thu Apr 26 2012 Pádraig Brady <P at draigBrady.com> 2012.1-2
+- Use parallel installed versions of python-paste-deploy and python-routes
+
 * Thu Apr 05 2012 Alan Pevec <apevec at redhat.com> 2012.1-1
 - Essex release