From 2521e7488099f8159beb04c02dcf2ff60c21afa7 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Wed, 20 Apr 2016 08:46:23 +0200
Subject: [PATCH] Update keystoneauth1 to 2.6.0

- use license context function
- update Requires
- remove versions. global-requirements can be used instead
- execute tests during build

Change-Id: Ic72b08e1f73ac1e9eb5aa56058fbe4931753593e
---
 openstack/keystoneauth1/keystoneauth1.spec.j2 | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/openstack/keystoneauth1/keystoneauth1.spec.j2 b/openstack/keystoneauth1/keystoneauth1.spec.j2
index 4cab436e1..17027e43b 100644
--- a/openstack/keystoneauth1/keystoneauth1.spec.j2
+++ b/openstack/keystoneauth1/keystoneauth1.spec.j2
@@ -1,22 +1,39 @@
 %global sname keystoneauth1
 
 Name:           {{ py2name('keystoneauth1') }}
-Version:        2.2.0
+Version:        2.6.0
 Release:        0
 Summary:        OpenStack authenticating tools
-License:        {{ 'Apache-2.0' | license }}
+License:        {{ license('Apache-2.0') }}
 Group:          Development/Languages/Python
 Url:            https://launchpad.net/%{sname}
 Source0:        https://pypi.python.org/packages/source/k/%{sname}/%{sname}-%{version}.tar.gz
 BuildRequires:  openstack-macros
 BuildRequires:  {{ py2pkg('pbr') }}
-BuildRequires:  {{ py2pkg('setuptools') }}
-Requires:       {{ py2pkg('iso8601', (">=", "0.1.9")) }}
-Requires:       {{ py2pkg('lxml', (">=", "2.3")) }}
-Requires:       {{ py2pkg('requests', (">=", "2.8.1")) }}
-Requires:       {{ py2pkg('requests-kerberos', (">=", "0.6")) }}
-Requires:       {{ py2pkg('six', (">=", "1.9.0")) }}
-Requires:       {{ py2pkg('stevedore', (">=", "1.5.0")) }}
+BuildRequires:  {{ py2pkg('requests-kerberos') }}
+BuildRequires:  {{ py2pkg('positional') }}
+BuildRequires:  {{ py2pkg('iso8601') }}
+BuildRequires:  {{ py2pkg('fixtures') }}
+BuildRequires:  {{ py2pkg('mock') }}
+BuildRequires:  {{ py2pkg('oslo.config') }}
+BuildRequires:  {{ py2pkg('oslo.utils') }}
+BuildRequires:  {{ py2pkg('oslotest') }}
+BuildRequires:  {{ py2pkg('os-testr') }}
+BuildRequires:  {{ py2pkg('betamax') }}
+BuildRequires:  {{ py2pkg('pycrypto') }}
+BuildRequires:  {{ py2pkg('pep8') }}
+BuildRequires:  {{ py2pkg('reno') }}
+BuildRequires:  {{ py2pkg('requests-mock') }}
+BuildRequires:  {{ py2pkg('testrepository') }}
+BuildRequires:  {{ py2pkg('testresources') }}
+BuildRequires:  {{ py2pkg('testtools') }}
+Requires:       {{ py2pkg('iso8601') }}
+Requires:       {{ py2pkg('lxml') }}
+Requires:       {{ py2pkg('requests') }}
+Requires:       {{ py2pkg('requests-kerberos') }}
+Requires:       {{ py2pkg('six') }}
+Requires:       {{ py2pkg('stevedore') }}
+Requires:       {{ py2pkg('positional') }}
 BuildArch:      noarch
 
 %description
@@ -48,6 +65,9 @@ Documentation for OpenStack authenticating tools.
 # remove the sphinx-build leftovers
 rm -rf doc/build/html/.{doctrees,buildinfo}
 
+%check
+%{__python2} setup.py testr
+
 %files
 %license LICENSE
 %doc AUTHORS ChangeLog README.rst