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

[Alan Pevec]

commit 032e51fc6877cfd31f542cd1bc8dc132423da7c8
Merge: c3fea50 357ea8a
Author: Alan Pevec <apevec at redhat.com>
Date:   Sat Jun 30 01:11:46 2012 +0200

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

 .gitignore                                         |    2 +-
 ..._nova_auth-only-create-roles-which-don-t-.patch |   62 --------
 0001-fix-man-page-build.patch                      |  137 +++++++++++++++++
 0002-Fix-test-env-for-the-stable-branch.patch      |   65 --------
 0002-fix-sphinx-warnings.patch                     |   67 +++++++++
 ...s-url-conversion-in-export_legacy_catalog.patch |   49 ------
 0003-match-egg-and-spec-requires.patch             |   34 +++++
 ...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                            |   67 ++++++---
 sources                                            |    2 +-
 12 files changed, 286 insertions(+), 564 deletions(-)
---
diff --cc openstack-keystone.spec
index 87a523c,32afa79..af180fa
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -21,33 -19,22 +19,30 @@@ Source0:        http://launchpad.net/ke
  #Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz
  #Source0:        http://keystone.openstack.org/tarballs/keystone-%{version}%{snaptag}.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=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
+ Patch0001: 0001-fix-man-page-build.patch
+ Patch0002: 0002-fix-sphinx-warnings.patch
+ Patch0003: 0003-match-egg-and-spec-requires.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
@@@ -78,13 -64,13 +73,14 @@@ Requires:       python-lda
  Requires:       python-lxml
  Requires:       python-memcached
  Requires:       python-migrate
 -Requires:       python-paste-deploy
 -Requires:       python-routes
 -Requires:       python-sqlalchemy
 -Requires:       python-webob
 +Requires:       python-paste-deploy1.5
 +Requires:       python-routes1.12
 +Requires:       python-sqlalchemy0.7
 +Requires:       python-webob1.0
  Requires:       python-passlib
 +Requires:       python-setuptools
  Requires:       MySQL-python
+ Requires:       PyPAM
  
  %description -n   python-keystone
  Keystone is a Python implementation of the OpenStack
@@@ -108,9 -94,22 +104,23 @@@ Keystone is a Python implementation of 
  
  This package contains the Keystone Authentication Middleware.
  
+ %if 0%{?with_doc}
+ %package doc
+ Summary:        Documentation for OpenStack Identity Service
+ Group:          Documentation
+ 
+ Requires:       %{name} = %{version}-%{release}
+ 
+ %description doc
+ Keystone is a Python implementation of the OpenStack
+ (http://www.openstack.org) identity service API.
+ 
+ This package contains documentation for Keystone.
+ %endif
+ 
  %prep
  %setup -q -n keystone-%{version}
 +%patch0 -p1 -b .newdeps
  
  %patch0001 -p1
  %patch0002 -p1
@@@ -159,7 -153,17 +166,17 @@@ install -d -m 755 %{buildroot}%{_locals
  
  # docs generation requires everything to be installed first
  export PYTHONPATH="$( pwd ):$PYTHONPATH"
- make SPHINXAPIDOC=echo SPHINXBUILD=sphinx-1.0-build -C doc html
+ pushd doc
+ if [ -x /usr/bin/sphinx-apidoc ]; then
+     make html
+     make man
+ else
 -    make html SPHINXAPIDOC=echo
 -    make man SPHINXAPIDOC=echo
++    make html SPHINXAPIDOC=echo SPHINXBUILD=sphinx-1.0-build
++    make man SPHINXAPIDOC=echo SPHINXBUILD=sphinx-1.0-build
+ fi
+ mkdir -p %{buildroot}%{_mandir}/man1
+ install -p -D -m 644 build/man/*.1 %{buildroot}%{_mandir}/man1/
+ popd
  # Fix hidden-file-or-dir warnings
  rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
  
@@@ -255,14 -245,19 +272,22 @@@ f
  %ghost %{python_sitelib}/keystone/middleware/__init__.py
  %{python_sitelib}/keystone/middleware/auth_token.py*
  
+ %if 0%{?with_doc}
+ %files doc
+ %doc LICENSE doc/build/html
+ %endif
+ 
  %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
 +* Thu Jun 21 2012 Alan Pevec <apevec at redhat.com> 2012.1-9
 +- add upstart job, alternative to sysv initscript
 +
 +* Fri Jun 15 2012 Alan Pevec <apevec at redhat.com> 2012.1-8
  - fix upgrade case with python-keystone-auth-token (rhbz#824034#c20)
  
 -* 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)