From 4c8a2bf5f732cf003a016299915f0850329770dd Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Nov 07 2018 12:41:48 +0000
Subject: Subpackage python2-barbicanclient has been removed


---

diff --git a/python-barbicanclient.spec b/python-barbicanclient.spec
index 0f9f959..e788968 100644
--- a/python-barbicanclient.spec
+++ b/python-barbicanclient.spec
@@ -1,9 +1,6 @@
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
 %global sname barbicanclient
-%if 0%{?fedora}
-%global with_python3 1
-%endif
 
 %global common_desc \
 This is a client for the Barbican Key Management API. There is a \
@@ -12,7 +9,7 @@ a command-line script (barbican).
 
 Name:           python-barbicanclient
 Version:        4.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Client Library for OpenStack Barbican Key Management API
 
 License:        ASL 2.0
@@ -26,41 +23,13 @@ BuildArch:      noarch
 %{common_desc}
 
 
-%package -n python2-%{sname}
-Summary:        Client Library for OpenStack Barbican Key Management API
-
-BuildRequires:  python2-devel
-BuildRequires:  python2-pbr
-BuildRequires:  python2-setuptools
-BuildRequires:  git
-
-Requires:       python2-requests
-Requires:       python2-six >= 1.10.0
-Requires:       python2-oslo-i18n >= 3.15.3
-Requires:       python2-oslo-serialization >= 2.18.0
-Requires:       python2-oslo-utils >= 3.33.0
-Requires:       python2-prettytable
-Requires:       python2-keystoneauth1 >= 3.3.0
-Requires:       python2-pbr >= 2.0.0
-%if 0%{?fedora} > 0
-Requires:       python2-cliff
-%else
-Requires:       python-cliff
-%endif
-
-%{?python_provide:%python_provide python2-%{sname}}
-
-%description -n python2-%{sname}
-%{common_desc}
-
-
-%if 0%{?with_python3}
 %package -n python3-%{sname}
 Summary:        Client Library for OpenStack Barbican Key Management API
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-pbr
 BuildRequires:  python3-setuptools
+BuildRequires:  git-core
 
 Requires:       python3-requests
 Requires:       python3-six >= 1.10.0
@@ -76,18 +45,18 @@ Requires:       python3-pbr >= 2.0.0
 
 %description -n python3-%{sname}
 %{common_desc}
-%endif
 
 
 %package doc
 Summary: Documentation for OpenStack Barbican API client
 
-BuildRequires:  python2-sphinx
-BuildRequires:  python2-openstackdocstheme
-BuildRequires:  python2-oslo-utils
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-openstackdocstheme
+BuildRequires:  python3-oslo-utils
+BuildRequires:  python3-sphinx
 BuildRequires:  dos2unix
-BuildRequires:  python2-oslo-i18n
-BuildRequires:  python2-prettytable
+BuildRequires:  python3-oslo-i18n
+BuildRequires:  python3-prettytable
 
 %description doc
 Documentation for the barbicanclient module
@@ -100,54 +69,34 @@ sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
 rm -rf {test-,}requirements.txt
 
 %build
-%py2_build
-%if 0%{?with_python3}
 %py3_build
-%endif
 
 # doc
-%{__python2} 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
+dos2unix doc/build/html/_static/jquery.js
 
 %install
-%if 0%{?with_python3}
 %py3_install
-mv %{buildroot}%{_bindir}/barbican %{buildroot}%{_bindir}/barbican-%{python3_version}
-ln -s ./barbican-%{python3_version} %{buildroot}%{_bindir}/barbican-3
-%endif
-
-%py2_install
-mv %{buildroot}%{_bindir}/barbican %{buildroot}%{_bindir}/barbican-%{python2_version}
-ln -s ./barbican-%{python2_version} %{buildroot}%{_bindir}/barbican-2
-
-ln -s ./barbican-2 %{buildroot}%{_bindir}/barbican
 
-dos2unix doc/build/html/_static/jquery.js
-
-
-%files -n python2-%{sname}
-%license LICENSE
-%doc AUTHORS CONTRIBUTING.rst README.rst PKG-INFO ChangeLog
-%{_bindir}/barbican
-%{_bindir}/barbican-2*
-%{python2_sitelib}/barbicanclient
-%{python2_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
 
-%if 0%{?with_python3}
 %files -n python3-%{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
-%endif
 
 %files doc
 %doc doc/build/html
 %license LICENSE
 
 %changelog
+* Wed Nov 07 2018 Miro Hrončok <mhroncok@redhat.com> - 4.6.0-2
+- Subpackage python2-barbicanclient has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
 * Sat Feb 10 2018 RDO <dev@lists.rdoproject.org> 4.6.0-1
 - Update to 4.6.0