[openstack-keystone/el6-grizzly: 2/2] Merge branch 'master' into el6-grizzly

[Alan Pevec]

commit c6c29832e32efca236c6ed8cea7dea1114678d6a
Merge: 1a3f537 dbf36b8
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Apr 5 07:55:31 2013 +0200

    Merge branch 'master' into el6-grizzly

 .gitignore              |    1 +
 openstack-keystone.spec |   18 ++++++++----------
 sources                 |    2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)
---
diff --cc openstack-keystone.spec
index 48dd169,b36b25c..87ac73f
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -14,17 -12,14 +12,16 @@@ 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}-%{release_letter}%{milestone}/+download/keystone-%{version}.%{release_letter}%{milestone}.tar.gz
+ Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
  Source1:        openstack-keystone.logrotate
 -Source2:        openstack-keystone.service
 +Source2:        openstack-keystone.init
 +Source3:        openstack-keystone.upstart
  Source5:        openstack-keystone-sample-data
  
 +Patch0:       openstack-keystone-newdeps.patch
  
  #
- # patches_base=2013.1.rc3
+ # patches_base=2013.1
  #
  
  BuildArch:      noarch
@@@ -94,11 -81,8 +91,9 @@@ This package contains documentation fo
  %endif
  
  %prep
- %setup -q -n keystone-%{version}.%{release_letter}%{milestone}
+ %setup -q -n keystone-%{version}
 +%patch0 -p1 -b .newdeps
  
- sed -i 's/2013.1.rc3/2013.1/' 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