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

[Alan Pevec]

commit ff1cac3ca73ad7219bf633f1b0a93b2b920ec8b9
Merge: c07362b 87597af
Author: Alan Pevec <apevec at redhat.com>
Date:   Thu Mar 27 15:14:05 2014 +0100

    Merge branch 'master' into el6-icehouse

 .gitignore                                         |    1 +
 0001-remove-runtime-dep-on-python-pbr.patch        |   20 +++++++-------
 ...-parameter-values-with-keystone-dist.conf.patch |   28 ++++++++++----------
 openstack-keystone.spec                            |   16 +++++-----
 sources                                            |    2 +-
 5 files changed, 34 insertions(+), 33 deletions(-)
---
diff --cc openstack-keystone.spec
index e81c72a,98e7eb2..7fe32ce
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -14,13 -14,11 +14,13 @@@ 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}/%{release_name}-%{milestone}/+download/keystone-%{version}.b%{milestone}.tar.gz
+ Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.%{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
 +Source21:       daemon_notify.sh
  
  
  #
@@@ -117,10 -102,8 +117,10 @@@ This package contains documentation fo
  %patch0001 -p1
  %patch0002 -p1
  %patch0003 -p1
 +%patch0004 -p1
 +%patch0005 -p1
  
- sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
+ sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
  
  find . \( -name .gitignore -o -name .placeholder \) -delete
  find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;