[openstack-keystone/f17] match egg and spec requires

[Alan Pevec]

commit 357ea8a88899fd8a8a834a95b4d4268035f83c49
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.

 0003-match-egg-and-spec-requires.patch |   34 ++++++++++++++++++++++++++++++++
 openstack-keystone.spec                |    3 ++
 2 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/0003-match-egg-and-spec-requires.patch b/0003-match-egg-and-spec-requires.patch
new file mode 100644
index 0000000..21f3b1e
--- /dev/null
+++ b/0003-match-egg-and-spec-requires.patch
@@ -0,0 +1,34 @@
+From bdf3cf49b619bbf85c12c26a042a8f020568b0a4 Mon Sep 17 00:00:00 2001
+From: Alan Pevec <apevec at redhat.com>
+Date: Sat, 30 Jun 2012 01:00:25 +0200
+Subject: [PATCH] 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.
+
+FEDORA SPECIFIC - do not send upstream!
+
+Change-Id: I8c6a1c73c1b1c6edbf507cb5f0ba91f3f97cdd72
+---
+ tools/pip-requires |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/tools/pip-requires b/tools/pip-requires
+index 0e13534..5c5e45e 100644
+--- a/tools/pip-requires
++++ b/tools/pip-requires
+@@ -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 5845b88..32afa79 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -27,6 +27,7 @@ Source5:        openstack-keystone-sample-data
 #
 Patch0001: 0001-fix-man-page-build.patch
 Patch0002: 0002-fix-sphinx-warnings.patch
+Patch0003: 0003-match-egg-and-spec-requires.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -69,6 +70,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
@@ -111,6 +113,7 @@ This package contains documentation for Keystone.
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;