[rpms/python-barbicanclient] f45: Sync from RDO ussuri release from python-barbicanclient-4.10.0-1.el8

[rpms/python-barbicanclient] f45: Sync from RDO ussuri release from python-barbicanclient-4.10.0-1.el8

[Joel Capitao]

A new commit has been pushed.

Repo   : rpms/python-barbicanclient
Branch : f45
Commit : 60ade99943daada2fbe8278526d8f6eef4775957
Author : Joel Capitao <jcapitao@redhat.com>
Date   : 2020-06-03T18:58:06+02:00
Stats  : +37/-45 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/python-barbicanclient/c/60ade99943daada2fbe8278526d8f6eef4775957?branch=f45

Log:
Sync from RDO ussuri release from python-barbicanclient-4.10.0-1.el8

---
diff --git a/.gitignore b/.gitignore
index 5c8e703..bae9958 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /python-barbicanclient-4.6.0.tar.gz
 /python-barbicanclient-4.8.1.tar.gz
 /python-barbicanclient-4.9.0.tar.gz
+/python-barbicanclient-4.10.0.tar.gz

diff --git a/python-barbicanclient.spec b/python-barbicanclient.spec
index 07a4e0e..9067e7c 100644
--- a/python-barbicanclient.spec
+++ b/python-barbicanclient.spec
@@ -1,14 +1,3 @@
-# Macros for py2/py3 compatibility
-%if 0%{?fedora} || 0%{?rhel} > 7
-%global pyver %{python3_pkgversion}
-%else
-%global pyver 2
-%endif
-%global pyver_bin python%{pyver}
-%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
-%global pyver_install %{expand:%{py%{pyver}_install}}
-%global pyver_build %{expand:%{py%{pyver}_build}}
-# End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
 %global with_doc 1
@@ -21,8 +10,8 @@ Python library for accessing the API (barbicanclient module), and \
 a command-line script (barbican).
 
 Name:           python-barbicanclient
-Version:        4.9.0
-Release:        4%{?dist}
+Version:        4.10.0
+Release:        1%{?dist}
 Summary:        Client Library for OpenStack Barbican Key Management API
 
 License:        ASL 2.0
@@ -35,38 +24,37 @@ BuildRequires:  git
 %description
 %{common_desc}
 
-%package -n python%{pyver}-%{sname}
+%package -n python3-%{sname}
 Summary:        Client Library for OpenStack Barbican Key Management API
-%{?python_provide:%python_provide python%{pyver}-%{sname}}
-%if %{pyver} == 3
+%{?python_provide:%python_provide python3-%{sname}}
 Obsoletes: python2-%{sname} < %{version}-%{release}
-%endif
 
-BuildRequires:  python%{pyver}-devel
-BuildRequires:  python%{pyver}-pbr
-BuildRequires:  python%{pyver}-setuptools
-Requires:       python%{pyver}-requests
-Requires:       python%{pyver}-six >= 1.10.0
-Requires:       python%{pyver}-oslo-i18n >= 3.15.3
-Requires:       python%{pyver}-oslo-serialization >= 2.18.0
-Requires:       python%{pyver}-oslo-utils >= 3.33.0
-Requires:       python%{pyver}-prettytable
-Requires:       python%{pyver}-keystoneauth1 >= 3.4.0
-Requires:       python%{pyver}-pbr >= 2.0.0
-Requires:       python%{pyver}-cliff
-
-%description -n python%{pyver}-%{sname}
+BuildRequires:  python3-devel
+BuildRequires:  python3-pbr
+BuildRequires:  python3-setuptools
+Requires:       python3-requests
+Requires:       python3-six >= 1.10.0
+Requires:       python3-oslo-i18n >= 3.15.3
+Requires:       python3-oslo-serialization >= 2.18.0
+Requires:       python3-oslo-utils >= 3.33.0
+Requires:       python3-prettytable
+Requires:       python3-keystoneauth1 >= 3.4.0
+Requires:       python3-pbr >= 2.0.0
+Requires:       python3-cliff
+
+%description -n python3-%{sname}
 %{common_desc}
 
 %if 0%{?with_doc}
 %package -n python-%{sname}-doc
 Summary: Documentation for OpenStack Barbican API client
 
-BuildRequires:  python%{pyver}-sphinx
-BuildRequires:  python%{pyver}-openstackdocstheme
-BuildRequires:  python%{pyver}-oslo-utils
-BuildRequires:  python%{pyver}-oslo-i18n
-BuildRequires:  python%{pyver}-prettytable
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-sphinxcontrib-rsvgconverter
+BuildRequires:  python3-openstackdocstheme
+BuildRequires:  python3-oslo-utils
+BuildRequires:  python3-oslo-i18n
+BuildRequires:  python3-prettytable
 
 %description -n python-%{sname}-doc
 Documentation for the barbicanclient module
@@ -80,26 +68,26 @@ sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
 rm -rf {test-,}requirements.txt
 
 %build
-%{pyver_build}
+%{py3_build}
 
 %if 0%{?with_doc}
 # doc
-%{pyver_bin} setup.py build_sphinx -b html
+%{__python3} setup.py build_sphinx -b html
 # Fix hidden-file-or-dir warnings
 rm -fr doc/build/html/.buildinfo
 %endif
 
 %install
-%{pyver_install}
-ln -s ./barbican %{buildroot}%{_bindir}/barbican-%{pyver}
+%{py3_install}
+ln -s ./barbican %{buildroot}%{_bindir}/barbican-3
 
-%files -n python%{pyver}-%{sname}
+%files -n python3-%{sname}
 %license LICENSE
 %doc AUTHORS CONTRIBUTING.rst README.rst PKG-INFO ChangeLog
 %{_bindir}/barbican
-%{_bindir}/barbican-%{pyver}
-%{pyver_sitelib}/barbicanclient
-%{pyver_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
+%{_bindir}/barbican-3
+%{python3_sitelib}/barbicanclient
+%{python3_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
 
 %if 0%{?with_doc}
 %files -n python-%{sname}-doc
@@ -108,6 +96,9 @@ ln -s ./barbican %{buildroot}%{_bindir}/barbican-%{pyver}
 %endif
 
 %changelog
+* Wed Jun 03 2020 Joel Capitao <jcapitao@redhat.com> 4.10.0-1
+- Update to upstream version 4.10.0
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 4.9.0-4
 - Rebuilt for Python 3.9
 

diff --git a/sources b/sources
index 085b5f3..23138ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-barbicanclient-4.9.0.tar.gz) = dfd6811165a66daffb245e43d05463d01e8d3d864ad4a468611edd5312d029b870f677791a5d4d48a08a3b4542906e5372c74bce4ac5987bc93667d0cb524f66
+SHA512 (python-barbicanclient-4.10.0.tar.gz) = c1b098b1675e396e5caeab376f047316f0c8e63520a28a4dc1d0e2063d352bef3a85ac43271c9a7e96cc7cfe7af2ee0b410ed2bb1545fcc3872d93aade9da762