[openstack-keystone/el6: 4/5] fix paste.deploy dependency

[Alan Pevec]

commit 40d1d6cdb5599f7fca78d75e32aeddac0732ef7a
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue May 29 19:39:24 2012 +0200

    fix paste.deploy dependency
    
    parallel installed versions are loaded in keystone package,
    so import paste.deploy after keystone in keystone-all
    
    rhbz#826120

 openstack-keystone-newdeps.patch |   16 ++++++++++++++++
 openstack-keystone.spec          |    5 ++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/openstack-keystone-newdeps.patch b/openstack-keystone-newdeps.patch
index 4271c69..b6f88aa 100644
--- a/openstack-keystone-newdeps.patch
+++ b/openstack-keystone-newdeps.patch
@@ -30,3 +30,19 @@
 +# TODO: See can we get pkg_resources to do the right thing directly
 +import paste
 +paste.__path__.insert(0, paste.__path__.pop(-1))
+--- keystone-2012.1/bin/keystone-all.orig	2012-04-04 04:22:54.000000000 +0200
++++ keystone-2012.1/bin/keystone-all	2012-05-29 19:32:51.728668936 +0200
+@@ -16,11 +16,11 @@
+                                '__init__.py')):
+     sys.path.insert(0, possible_topdir)
+ 
+-from paste import deploy
+-
+ from keystone import config
+ from keystone.common import wsgi
+ 
++from paste import deploy
++
+ 
+ CONF = config.CONF
+ 
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index a222bf8..5b67830 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -11,7 +11,7 @@
 
 Name:           openstack-keystone
 Version:        2012.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 #Release:       0.1.%{release_letter}%{milestone}%{?dist}
 Summary:        OpenStack Identity Service
 
@@ -197,6 +197,9 @@ fi
 %{python_sitelib}/keystone-%{version}-*.egg-info
 
 %changelog
+* Tue May 29 2012 Alan Pevec <apevec at redhat.com> 2012.1-6
+- fix paste.deploy dependency (rhbz#826120)
+
 * Mon May 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-5
 - Sync up with Essex stable branch
 - Remove dependencies no loner needed by Essex