[rpms/python-barbicanclient] epel10: Sync from RDO train release

[rpms/python-barbicanclient] epel10: Sync from RDO train release

[Alfredo Moralejo]

A new commit has been pushed.

Repo   : rpms/python-barbicanclient
Branch : epel10
Commit : 3dbfc7bf9963de31114331dfc881f7a983665a86
Author : Alfredo Moralejo <amoralej@redhat.com>
Date   : 2019-11-06T10:18:22+01:00
Stats  : +43/-36 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/python-barbicanclient/c/3dbfc7bf9963de31114331dfc881f7a983665a86?branch=epel10

Log:
Sync from RDO train release

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

diff --git a/python-barbicanclient.spec b/python-barbicanclient.spec
index 4987568..2eefc13 100644
--- a/python-barbicanclient.spec
+++ b/python-barbicanclient.spec
@@ -11,7 +11,6 @@
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
-
 %global with_doc 1
 
 %global sname barbicanclient
@@ -22,8 +21,8 @@ Python library for accessing the API (barbicanclient module), and \
 a command-line script (barbican).
 
 Name:           python-barbicanclient
-Version:        4.8.1
-Release:        4%{?dist}
+Version:        4.9.0
+Release:        2%{?dist}
 Summary:        Client Library for OpenStack Barbican Key Management API
 
 License:        ASL 2.0
@@ -36,34 +35,40 @@ BuildRequires:  git
 %description
 %{common_desc}
 
-%package -n python3-%{sname}
+%package -n python%{pyver}-%{sname}
 Summary:        Client Library for OpenStack Barbican Key Management API
-%{?python_provide:%python_provide python3-%{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}
+%{?python_provide:%python_provide python%{pyver}-%{sname}}
+%if %{pyver} == 3
+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}
 %{common_desc}
 
 %if 0%{?with_doc}
-%package doc
+%package -n python-%{sname}-doc
 Summary: Documentation for OpenStack Barbican API client
 
-BuildRequires:  python3-sphinx
-BuildRequires:  python3-openstackdocstheme
+BuildRequires:  python%{pyver}-sphinx
+BuildRequires:  python%{pyver}-openstackdocstheme
+BuildRequires:  python%{pyver}-oslo-utils
+BuildRequires:  python%{pyver}-oslo-i18n
+BuildRequires:  python%{pyver}-prettytable
 
-%description doc
+%description -n python-%{sname}-doc
 Documentation for the barbicanclient module
 %endif
 
@@ -75,36 +80,37 @@ sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
 rm -rf {test-,}requirements.txt
 
 %build
-%py3_build
+%{pyver_build}
 
 %if 0%{?with_doc}
 # doc
-%{__python3} setup.py build_sphinx -b html
+%{pyver_bin} setup.py build_sphinx -b html
 # Fix hidden-file-or-dir warnings
 rm -fr doc/build/html/.buildinfo
 %endif
 
 %install
-%py3_install
-mv %{buildroot}%{_bindir}/barbican %{buildroot}%{_bindir}/barbican-3
+%{pyver_install}
+ln -s ./barbican %{buildroot}%{_bindir}/barbican-%{pyver}
 
-ln -s ./barbican-3 %{buildroot}%{_bindir}/barbican
-
-%files -n python3-%{sname}
+%files -n python%{pyver}-%{sname}
 %license LICENSE
 %doc AUTHORS CONTRIBUTING.rst README.rst PKG-INFO ChangeLog
-%{_bindir}/barbican-3
 %{_bindir}/barbican
-%{python3_sitelib}/barbicanclient
-%{python3_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
+%{_bindir}/barbican-%{pyver}
+%{pyver_sitelib}/barbicanclient
+%{pyver_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
 
 %if 0%{?with_doc}
-%files doc
+%files -n python-%{sname}-doc
 %doc doc/build/html
 %license LICENSE
 %endif
 
 %changelog
+* Wed Nov 06 2019 Alfredo Moralejo <amoralej@redhat.com> 4.9.0-2
+- Update to upstream version 4.9.0
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 4.8.1-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 

diff --git a/sources b/sources
index 39bc368..085b5f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-barbicanclient-4.8.1.tar.gz) = 836b54156e72faf7ec590d6f11ccc2ca61258da38368410fb65f448b8a0e0ea272d224f46f5c6f08afc7477197a090be77720e07e3a4cb60ef71982367dbfcdb
+SHA512 (python-barbicanclient-4.9.0.tar.gz) = dfd6811165a66daffb245e43d05463d01e8d3d864ad4a468611edd5312d029b870f677791a5d4d48a08a3b4542906e5372c74bce4ac5987bc93667d0cb524f66