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

[Alan Pevec]

commit 5d2efee6a8ca66a4e679cd029366354a704515e3
Merge: 40d1d6c beb0635
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue May 29 19:53:35 2012 +0200

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

 openstack-keystone.spec |   44 +++++++++++++++++++++++++++++++++++++-------
 1 files changed, 37 insertions(+), 7 deletions(-)
---
diff --cc openstack-keystone.spec
index 5b67830,c148006..64a8d33
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -84,11 -77,32 +86,33 @@@ Keystone is a Python implementation of 
  
  This package contains the Keystone Python library.
  
+ %package -n     python-keystone-auth-token
+ Summary:        Keystone Authentication Middleware.
+ Group:          Applications/System
 -# python-keystone-auth-token added in 2012.1-3
 -Conflicts:      python-keystone < 2012.1-3
++# python-keystone-auth-token added in 2012.1-6.el6
++Conflicts:      python-keystone < 2012.1-6.el6
+ 
+ Requires:       python-iso8601
+ Requires:       python-memcached
+ Requires:       python-webob
+ 
+ %description -n   python-keystone-auth-token
+ Keystone is a Python implementation of the OpenStack
+ (http://www.openstack.org) identity service API.
+ 
+ This package contains the Keystone Authentication Middleware.
+ 
  %prep
  %setup -q -n keystone-%{version}
 +%patch0 -p1 -b .newdeps
  
  %patch0001 -p1
+ 
+ find . \( -name .gitignore -o -name .placeholder \) -delete
+ find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
+ 
+ 
+ %build
  # change default configuration
  openstack-config --set etc/keystone.conf DEFAULT log_file %{_localstatedir}/log/keystone/keystone.log
  openstack-config --set etc/keystone.conf sql connection mysql://keystone:keystone@localhost/keystone
@@@ -194,13 -196,21 +215,22 @@@ f
  %defattr(-,root,root,-)
  %doc LICENSE
  %{python_sitelib}/keystone
+ %exclude %{python_sitelib}/keystone/middleware/auth_token.py*
  %{python_sitelib}/keystone-%{version}-*.egg-info
  
+ %files -n python-keystone-auth-token
+ %defattr(-,root,root,-)
+ %doc LICENSE
+ %dir %{python_sitelib}/keystone
+ %{python_sitelib}/keystone/middleware/auth_token.py*
+ 
  %changelog
 -* 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