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

[Pádraig Brady]

commit 3bf204b3802fc4412e30225c3d751159ae9284cc
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Apr 25 14:56:41 2012 +0100

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

 openstack-glance-newdeps.patch |   10 +++++++++-
 openstack-glance.spec          |   11 +++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/openstack-glance-newdeps.patch b/openstack-glance-newdeps.patch
index 2a8265a..f3eecec 100644
--- a/openstack-glance-newdeps.patch
+++ b/openstack-glance-newdeps.patch
@@ -5,7 +5,7 @@ system default module versions.
 diff -up glance-2011.3/glance/__init__.py.newdeps glance-2011.3/glance/__init__.py
 --- glance-2011.3/glance/__init__.py.newdeps	2012-01-06 17:22:36.000000000 +0000
 +++ glance-2011.3/glance/__init__.py	2012-01-06 17:25:01.019063547 +0000
-@@ -18,3 +18,25 @@
+@@ -18,3 +18,31 @@
  import gettext
  
  gettext.install('glance', unicode=1)
@@ -31,3 +31,11 @@ diff -up glance-2011.3/glance/__init__.py.newdeps glance-2011.3/glance/__init__.
 +
 +replace_dist("SQLALchemy >= 0.6.3")
 +replace_dist("WebOb >= 1.0")
++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))
diff --git a/openstack-glance.spec b/openstack-glance.spec
index f6399a5..2845e25 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -1,6 +1,6 @@
 Name:             openstack-glance
 Version:          2012.1
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
@@ -57,8 +57,8 @@ Requires:         python-httplib2
 Requires:         python-iso8601
 Requires:         python-kombu
 Requires:         python-migrate
-Requires:         python-paste-deploy
-Requires:         python-routes
+Requires:         python-paste-deploy1.5
+Requires:         python-routes1.12
 Requires:         python-sqlalchemy0.7
 Requires:         python-webob1.0
 Requires:         python-setuptools
@@ -85,7 +85,7 @@ BuildRequires:    python-boto
 BuildRequires:    python-daemon
 BuildRequires:    python-eventlet
 BuildRequires:    python-gflags
-BuildRequires:    python-routes
+BuildRequires:    python-routes1.12
 BuildRequires:    python-sqlalchemy0.7
 BuildRequires:    python-webob1.0
 
@@ -225,6 +225,9 @@ fi
 %doc doc/build/html
 
 %changelog
+* Wed Apr 25 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-5
+- Use parallel installed versions of python-routes and python-paste-deploy
+
 * Wed Apr 25 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-4
 - Fix leak of swift objects on deletion