[openstack-keystone/el6-grizzly] grizzly-3 milestone

[Alan Pevec]

commit ffeb5cc1caf4daebfa94ac99dbe4a42d0a853d61
Author: Alan Pevec <apevec at redhat.com>
Date:   Sat Feb 23 18:07:40 2013 +0100

    grizzly-3 milestone

 .gitignore              |    2 +-
 openstack-keystone.spec |   23 +++++++++++++++--------
 sources                 |    2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c7ecbb..93b8262 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/keystone-2013.1~g2.tar.gz
+/keystone-2013.1.g3.tar.gz
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 463a945..eb82c45 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,21 +1,21 @@
 #
-# This is 2013.1 grizzly-2 milestone
+# This is 2013.1 grizzly-3 milestone
 #
 %global release_name grizzly
 %global release_letter g
-%global milestone 2
+%global milestone 3
 
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:           openstack-keystone
 Version:        2013.1
-Release:        0.2.%{release_letter}%{milestone}%{?dist}
+Release:        0.4.%{release_letter}%{milestone}%{?dist}
 Summary:        OpenStack Identity Service
 
 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}~%{release_letter}%{milestone}.tar.gz
+Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}.%{release_letter}%{milestone}.tar.gz
 Source1:        openstack-keystone.logrotate
 Source2:        openstack-keystone.init
 Source3:        openstack-keystone.upstart
@@ -24,9 +24,8 @@ Source5:        openstack-keystone-sample-data
 Patch0:       openstack-keystone-newdeps.patch
 
 #
-# patches_base=grizzly-2
+# patches_base=grizzly-3
 #
-Patch0001: 0001-match-egg-and-spec-requires.patch
 
 BuildArch:      noarch
 
@@ -101,13 +100,18 @@ This package contains documentation for Keystone.
 %endif
 
 %prep
-%setup -q -n keystone-%{version}
+%setup -q -n keystone-%{version}.%{release_letter}%{milestone}
 %patch0 -p1 -b .newdeps
 
-%patch0001 -p1
+sed -i 's/2013.1.g3/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
+rm -rf keystone.egg-info
+# let RPM handle deps
+sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
+
 
 
 %build
@@ -236,6 +240,9 @@ fi
 %endif
 
 %changelog
+* Sat Feb 23 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.4.g3
+- grizzly-3 milestone
+
 * Fri Jan 11 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.2.g2
 - grizzly-2 milestone
 
diff --git a/sources b/sources
index d2c2e52..0fe36e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a7b6d067ff0f3ffac0d74c77ef020723  keystone-2013.1~g2.tar.gz
+dd567851cd6fa0a7bc18ee197c1291b4  keystone-2013.1.g3.tar.gz