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

[Alan Pevec]

commit 336ea96352304654c60e4bda8b85956c2704748f
Merge: b71f0c8 733680f
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Dec 20 22:48:26 2013 +0100

    Merge branch 'master' into el6-icehouse

 .gitignore                                         |    1 +
 0001-remove-runtime-dep-on-python-pbr.patch        |   27 ++++++++++---------
 ...-parameter-values-with-keystone-dist.conf.patch |   14 +++++-----
 openstack-keystone.spec                            |   28 +++++++++++++------
 sources                                            |    2 +-
 5 files changed, 42 insertions(+), 30 deletions(-)
---
diff --cc openstack-keystone.spec
index fb93549,178af47..398cfef
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -12,10 -13,10 +13,11 @@@ Summary:        OpenStack Identity Serv
  
  License:        ASL 2.0
  URL:            http://keystone.openstack.org/
- Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
+ #Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
+ Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.b%{milestone}.tar.gz
  Source1:        openstack-keystone.logrotate
 -Source2:        openstack-keystone.service
 +Source2:        openstack-keystone.init
 +Source3:        openstack-keystone.upstart
  Source5:        openstack-keystone-sample-data
  Source20:       keystone-dist.conf
  
@@@ -25,28 -26,21 +27,28 @@@
  #
  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
  
  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.3.0
+ Requires:       python-keystoneclient >= 1:0.4.1
  
 -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
@@@ -104,8 -97,9 +106,10 @@@ This package contains documentation fo
  
  %patch0001 -p1
  %patch0002 -p1
 +%patch0003 -p1
  
+ sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
+ 
  find . \( -name .gitignore -o -name .placeholder \) -delete
  find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
  # Remove bundled egg-info