[openstack-keystone/el6: 3/3] Merge branch 'f17' into el6

[Alan Pevec]

commit c2388c806b55b67acbda8ccc58634dfb814b7c57
Merge: 5d2efee 6f73c53
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Jun 11 23:26:25 2012 +0200

    Merge branch 'f17' into el6
    
    Conflicts:
    	openstack-keystone.spec

 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                            |   35 +++++-
 6 files changed, 513 insertions(+), 1 deletions(-)
---
diff --cc openstack-keystone.spec
index 64a8d33,0d56c56..a6fb81a
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -11,7 -11,7 +11,7 @@@
  
  Name:           openstack-keystone
  Version:        2012.1
- Release:        6%{?dist}
 -Release:        4%{?dist}
++Release:        7%{?dist}
  #Release:       0.1.%{release_letter}%{milestone}%{?dist}
  Summary:        OpenStack Identity Service
  
@@@ -30,18 -28,18 +30,23 @@@ Patch0:       openstack-keystone-newdep
  # patches_base=2012.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
 -BuildRequires:  python-sphinx >= 1.0
 +BuildRequires:  python-sphinx10
  BuildRequires:  openstack-utils
  BuildRequires:  python-iniparse
 -BuildRequires:  systemd-units
 +# These are required to build due to the requirements check added
 +BuildRequires:  python-sqlalchemy0.7
 +BuildRequires:  python-webob1.0
 +BuildRequires:  python-paste-deploy1.5
 +BuildRequires:  python-routes1.12
  
  Requires:       python-keystone = %{version}-%{release}
  Requires:       python-keystoneclient >= 2012.1-0.4.e4
@@@ -104,9 -100,13 +109,14 @@@ This package contains the Keystone Auth
  
  %prep
  %setup -q -n keystone-%{version}
 +%patch0 -p1 -b .newdeps
  
  %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' {} \;
@@@ -162,13 -167,23 +172,27 @@@ exit 
  %post
  if [ $1 -eq 1 ] ; then
      # Initial installation
 +%if 0%{?fedora} >= 15
      /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 +%else
 +    /sbin/chkconfig --add openstack-keystone
 +%endif
  fi
  
+ %post -n python-keystone-auth-token
+ # workaround for rhbz 824034#c14
+ if [ ! -e %{python_sitelib}/keystone/__init__.py ]; then
+     > %{python_sitelib}/keystone/__init__.py
+ fi
+ if [ ! -e %{python_sitelib}/keystone/middleware/__init__.py ]; then
+     > %{python_sitelib}/keystone/middleware/__init__.py
+ fi
+ 
+ %triggerpostun -n python-keystone-auth-token -- python-keystone
+ # edge case: removing python-keystone with overlapping files
+ > %{python_sitelib}/keystone/__init__.py
+ > %{python_sitelib}/keystone/middleware/__init__.py
+ 
  %preun
  if [ $1 -eq 0 ] ; then
      # Package removal, not upgrade
@@@ -225,12 -233,17 +252,18 @@@ f
  %{python_sitelib}/keystone/middleware/auth_token.py*
  
  %changelog
 -* Mon Jun 11 2012 Alan Pevec <apevec at redhat.com> 2012.1-4
++* Mon Jun 11 2012 Alan Pevec <apevec at redhat.com> 2012.1-7
+ - Corrects url conversion in export_legacy_catalog (lp#994936)
+ - Invalidate user tokens when password is changed (lp#996595)
+ - Invalidate user tokens when a user is disabled (lp#997194)
+ - Carrying over token expiry time when token chaining (lp#998185)
+ 
 -* Thu May 24 2012 Alan Pevec <apevec at redhat.com> 2012.1-3
 +* Tue May 29 2012 Alan Pevec <apevec at redhat.com> 2012.1-6
  - python-keystone-auth-token subpackage (rhbz#824034)
  - use reserved user id for keystone (rhbz#752842)
 +- fix paste.deploy dependency (rhbz#826120)
  
 -* Mon May 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-2
 +* Mon May 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-5
  - Sync up with Essex stable branch
  - Remove dependencies no loner needed by Essex