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

[Alan Pevec]

commit 1a3f537db1258920f92e7aba2aef0d6b46047ae7
Merge: 81d9a5b 6956946
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Apr 3 23:21:58 2013 +0200

    Merge branch 'master' into el6-grizzly

 .gitignore              |    2 +-
 openstack-keystone.spec |   13 ++++++++-----
 sources                 |    2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --cc openstack-keystone.spec
index 1b29aed,3b37a05..48dd169
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -17,14 -17,12 +17,14 @@@ URL:            http://keystone.opensta
  #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
  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.rc2
+ # patches_base=2013.1.rc3
  #
  
  BuildArch:      noarch
@@@ -95,9 -85,8 +95,9 @@@ This package contains documentation fo
  
  %prep
  %setup -q -n keystone-%{version}.%{release_letter}%{milestone}
 +%patch0 -p1 -b .newdeps
  
- sed -i 's/2013.1.rc2/2013.1/' PKG-INFO
+ 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' {} \;