[openstack-keystone/f17] updated to stable essex release 2012.1.1

[Alan Pevec]

commit 6879767e2809e41e0b05cf02208ebb13ee4c6d7c
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Jun 22 17:47:02 2012 +0200

    updated to stable essex release 2012.1.1

 .gitignore                                         |    2 +-
 ..._nova_auth-only-create-roles-which-don-t-.patch |   62 --------
 0002-Fix-test-env-for-the-stable-branch.patch      |   65 --------
 ...s-url-conversion-in-export_legacy_catalog.patch |   49 ------
 ...date-user-tokens-when-password-is-changed.patch |  157 --------------------
 ...idate-user-tokens-when-a-user-is-disabled.patch |  148 ------------------
 ...ver-token-expiry-time-when-token-chaining.patch |   60 --------
 openstack-keystone.spec                            |   32 ++---
 sources                                            |    2 +-
 9 files changed, 12 insertions(+), 565 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af4a28e..8168662 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/keystone-2012.1.tar.gz
+/keystone-2012.1.1.tar.gz
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 24510b2..7c37346 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,17 +1,14 @@
 #
-# This is 2012.1 essex release
+# This is 2012.1.1 stable/essex release
 #
 %global release_name essex
-%global release_letter rc
-%global milestone 2
-%global snapdate 20120404
-%global git_revno r2201
-
-%global snaptag ~%{release_letter}%{milestone}~%{snapdate}.%{git_revno}
+%global snapdate 20120615
+%global git_revno 2215
+%global snaptag %{?milestone:~%{release_letter}%{milestone}}~%{snapdate}.%{git_revno}
 
 Name:           openstack-keystone
-Version:        2012.1
-Release:        5%{?dist}
+Version:        2012.1.1
+Release:        1%{?dist}
 #Release:       0.1.%{release_letter}%{milestone}%{?dist}
 Summary:        OpenStack Identity Service
 
@@ -25,14 +22,8 @@ Source2:        openstack-keystone.service
 Source5:        openstack-keystone-sample-data
 
 #
-# patches_base=2012.1
+# patches_base=2012.1.1
 #
-Patch0001: 0001-Make-import_nova_auth-only-create-roles-which-don-t-.patch
-Patch0002: 0002-Fix-test-env-for-the-stable-branch.patch
-Patch0003: 0003-Corrects-url-conversion-in-export_legacy_catalog.patch
-Patch0004: 0004-Invalidate-user-tokens-when-password-is-changed.patch
-Patch0005: 0005-Invalidate-user-tokens-when-a-user-is-disabled.patch
-Patch0006: 0006-Carrying-over-token-expiry-time-when-token-chaining.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -101,12 +92,6 @@ This package contains the Keystone Authentication Middleware.
 %prep
 %setup -q -n keystone-%{version}
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@ -236,6 +221,9 @@ fi
 %{python_sitelib}/keystone/middleware/auth_token.py*
 
 %changelog
+* Fri Jun 22 2012 Alan Pevec <apevec at redhat.com> 2012.1.1-1
+- updated to stable essex release 2012.1.1
+
 * Fri Jun 15 2012 Alan Pevec <apevec at redhat.com> 2012.1-5
 - fix upgrade case with python-keystone-auth-token (rhbz#824034#c20)
 
diff --git a/sources b/sources
index 6538cd3..4f8342f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf35c5f1794c237f92486cb7d30133b3  keystone-2012.1.tar.gz
+e4c45c9d3e46c535409ce86f15d5793b  keystone-2012.1.1.tar.gz