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

[Pádraig Brady]

commit f4a869a5981f72942f837338f9dff51be68ae7f6
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Apr 26 16:54:27 2012 +0100

    use parallel installed version of python-paste-deploy

 openstack-swift-newdeps.patch |    9 ++++++++-
 openstack-swift.spec          |    9 ++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/openstack-swift-newdeps.patch b/openstack-swift-newdeps.patch
index a7e38ba..3b4222a 100644
--- a/openstack-swift-newdeps.patch
+++ b/openstack-swift-newdeps.patch
@@ -1,7 +1,7 @@
 diff -ru swift-1.4.4-ORIG/swift/__init__.py swift-1.4.4/swift/__init__.py
 --- swift-1.4.4-ORIG/swift/__init__.py	2011-11-24 14:59:50.000000000 +0100
 +++ swift-1.4.4/swift/__init__.py	2012-01-04 00:09:10.122030579 +0100
-@@ -1,3 +1,25 @@
+@@ -1,3 +1,32 @@
 +import sys
 +import pkg_resources
 +
@@ -23,6 +23,13 @@ diff -ru swift-1.4.4-ORIG/swift/__init__.py swift-1.4.4/swift/__init__.py
 +
 +replace_dist("WebOb >= 1.0")
 +
++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-swift.spec b/openstack-swift.spec
index d426fdf..f4499e0 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -4,7 +4,7 @@
 
 Name:             openstack-swift
 Version:          1.4.8
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Object Storage (swift)
 
 Group:            Development/Languages
@@ -27,11 +27,11 @@ BuildRequires:    dos2unix
 BuildRequires:    python-devel
 BuildRequires:    python-setuptools
 BuildRequires:    python-netifaces
-BuildRequires:    python-paste-deploy
+BuildRequires:    python-paste-deploy1.5
 Requires:         python-configobj
 Requires:         python-eventlet >= 0.9.8
 Requires:         python-greenlet >= 0.3.1
-Requires:         python-paste-deploy
+Requires:         python-paste-deploy1.5
 Requires:         python-simplejson
 Requires:         python-webob1.0
 Requires:         pyxattr
@@ -323,6 +323,9 @@ fi
 %doc LICENSE doc/build/html
 
 %changelog
+* Thu Apr 26 2012 Pádraig Brady <P at draigBrady.com> 1.4.8-2
+- Use parallel installed version of python-paste-deploy
+
 * Thu Mar 22 2012 Alan Pevec <apevec at redhat.com> 1.4.8-1
 - Update to 1.4.8