[openstack-keystone/el6-icehouse: 3/5] Merge branch 'master' into el6-icehouse

[Alan Pevec]

commit 351861e3641c5e56cbc315d2558efd4676a95869
Merge: d3c8b2a 64ec7a0
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Mar 7 16:54:51 2014 +0100

    Merge branch 'master' into el6-icehouse

 .gitignore                                         |    1 +
 0001-remove-runtime-dep-on-python-pbr.patch        |   43 +++++-----
 ...-parameter-values-with-keystone-dist.conf.patch |   88 +++++++++++---------
 keystone-dist.conf                                 |   26 ++----
 openstack-keystone.spec                            |   22 +++--
 sources                                            |    2 +-
 6 files changed, 95 insertions(+), 87 deletions(-)
---
diff --cc openstack-keystone.spec
index b7a9244,7d7f167..f296227
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -27,29 -26,21 +27,29 @@@ Source20:       keystone-dist.con
  #
  Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
  Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
 +Patch0003: 0003-Use-updated-parallel-install-versions-of-epel-packag.patch
 +Patch0004: 0004-sphinx10-in-el6-does-not-have-apidoc-extension.patch
  
  BuildArch:      noarch
 +
  BuildRequires:  python2-devel
 -BuildRequires:  python-sphinx >= 1.0
 +BuildRequires:  python-sphinx10
  BuildRequires:  python-oslo-sphinx
 -BuildRequires:  systemd-units
  BuildRequires:  python-pbr
  BuildRequires:  python-d2to1
 +# These are required to build due to the requirements check added
 +BuildRequires:  python-sqlalchemy0.7
 +BuildRequires:  python-webob1.2
 +BuildRequires:  python-paste-deploy1.5
 +BuildRequires:  python-routes1.12
  
  Requires:       python-keystone = %{version}-%{release}
- Requires:       python-keystoneclient >= 1:0.4.1
+ Requires:       python-keystoneclient >= 1:0.6.0
  
 -Requires(post):   systemd-units
 -Requires(preun):  systemd-units
 -Requires(postun): systemd-units
 +Requires(post):   chkconfig
 +Requires(postun): initscripts
 +Requires(preun):  chkconfig
 +Requires(preun):  initscripts
  Requires(pre):    shadow-utils
  
  %description