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

[Alan Pevec]

commit 58c623ca1ed640df71d73fc9e23ac9a26348e7b8
Merge: 139b543 e68de3b
Author: Alan Pevec <apevec at redhat.com>
Date:   Tue Oct 16 12:21:35 2012 +0200

    Merge branch 'f17' into el6

 .gitignore                                         |    2 +-
 0001-fix-man-page-build.patch                      |    8 +-
 0002-fix-sphinx-warnings.patch                     |    8 +-
 0003-match-egg-and-spec-requires.patch             |    6 +-
 ...authz-to-update-user-s-tenant-bug-1040626.patch |   22 --
 0005-List-tokens-for-memcached-backend.patch       |  166 ---------------
 ...elete-user-tokens-after-role-grant-revoke.patch |  142 -------------
 ...it-token-revocation-to-tenant-bug-1050025.patch |  212 --------------------
 openstack-keystone.spec                            |   23 +--
 sources                                            |    2 +-
 10 files changed, 22 insertions(+), 569 deletions(-)
---
diff --cc openstack-keystone.spec
index 980c18c,d2dbc20..b54cbd5
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -17,34 -17,22 +17,30 @@@ URL:            http://keystone.opensta
  Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
  #Source0:        http://tarballs.openstack.org/keystone/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.2
+ # patches_base=2012.1.3
  #
  Patch0001: 0001-fix-man-page-build.patch
  Patch0002: 0002-fix-sphinx-warnings.patch
  Patch0003: 0003-match-egg-and-spec-requires.patch
- Patch0004: 0004-Require-authz-to-update-user-s-tenant-bug-1040626.patch
- Patch0005: 0005-List-tokens-for-memcached-backend.patch
- Patch0006: 0006-Delete-user-tokens-after-role-grant-revoke.patch
- Patch0007: 0007-Limit-token-revocation-to-tenant-bug-1050025.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