[openstack-keystone] match egg and spec requires

[Alan Pevec]

commit 177a2cd37d72337592e462894b5c3f66022bd32c
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Jun 27 11:53:21 2012 +0200

    match egg and spec requires
    
    Upstream build process generates egg requires from tools/pip-requires
    which are nailed for the upstream CI needs.
    This patch adjusts deps so that generated egg-info requires can be
    satisfied by the system packaged Python libraries.

 match-egg-and-spec-requires.patch |   15 +++++++++++++++
 openstack-keystone.spec           |    5 +++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/match-egg-and-spec-requires.patch b/match-egg-and-spec-requires.patch
new file mode 100644
index 0000000..1214f85
--- /dev/null
+++ b/match-egg-and-spec-requires.patch
@@ -0,0 +1,15 @@
+--- keystone-2012.2/tools/pip-requires.orig	2012-05-21 18:31:02.000000000 +0200
++++ keystone-2012.2/tools/pip-requires	2012-06-27 11:45:20.909425726 +0200
+@@ -1,6 +1,10 @@
+ # keystonelight dependencies
+-pam==0.1.4
+-WebOb==1.0.8
++# adjust deps so that generated egg-info matches Requires: in spec
++PyPAM
++WebOb
++python-ldap
++python-memcached
++MySQL-python
+ eventlet
+ greenlet
+ PasteDeploy
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index bded7b1..49002cb 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -23,6 +23,8 @@ Source1:        openstack-keystone.logrotate
 Source2:        openstack-keystone.service
 Source5:        openstack-keystone-sample-data
 
+Patch0:         match-egg-and-spec-requires.patch
+
 BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-sphinx >= 1.0
@@ -64,6 +66,7 @@ Requires:       python-sqlalchemy
 Requires:       python-webob
 Requires:       python-passlib
 Requires:       MySQL-python
+Requires:       PyPAM
 
 %description -n   python-keystone
 Keystone is a Python implementation of the OpenStack
@@ -90,6 +93,8 @@ This package contains the Keystone Authentication Middleware.
 %prep
 %setup -q -n keystone-%{version}
 
+%patch0 -p1
+
 find . \( -name .gitignore -o -name .placeholder \) -delete
 find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;