From bb8c3c5ba22301f84a6ef34be2112c7469ddb795 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Oct 28 2018 21:27:58 +0000
Subject: Subpackages python2-aodhclient, python2-aodhclient-tests have been removed


---

diff --git a/python-aodhclient.spec b/python-aodhclient.spec
index 7af2308..8627a07 100644
--- a/python-aodhclient.spec
+++ b/python-aodhclient.spec
@@ -1,14 +1,11 @@
 %global pypi_name aodhclient
 
-%if 0%{?fedora}
-%global with_python3 1
-%endif
 
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
 Name:             python-aodhclient
 Version:          0.7.0
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          Python API and CLI for OpenStack Aodh
 
 License:          ASL 2.0
@@ -21,34 +18,11 @@ BuildArch:        noarch
 This is a client library for Aodh built on the Aodh API. It
 provides a Python API (the aodhclient module) and a command-line tool.
 
-%package -n python2-%{pypi_name}
-Summary:          Python API and CLI for OpenStack Aodh
-%{?python_provide:%python_provide python2-%{pypi_name}}
-
-BuildRequires:    python-setuptools
-BuildRequires:    python2-devel
-BuildRequires:    python-pbr
-
-Requires:         python-pbr
-Requires:         python-cliff >= 1.14.0
-Requires:         python-oslo-i18n >= 1.5.0
-Requires:         python-oslo-serialization >= 1.4.0
-Requires:         python-oslo-utils >= 2.0.0
-Requires:         python-keystoneauth1 >= 1.0.0
-Requires:         python-six >= 1.9.0
-Requires:         python-debtcollector
-Requires:         python-osc-lib >= 1.0.1
-
-%description -n python2-%{pypi_name}
-This is a client library for Aodh built on the Aodh API. It
-provides a Python API (the aodhclient module) and a command-line tool.
-
-
 %package  doc
 Summary:          Documentation for OpenStack Aodh API Client
 
-BuildRequires:    python-sphinx
-BuildRequires:    python-oslo-sphinx
+BuildRequires:    python3-sphinx
+BuildRequires:    python3-oslo-sphinx
 
 
 %description doc
@@ -58,16 +32,6 @@ provides a Python API (the aodhclient module) and a command-line tool
 
 This package contains auto-generated documentation.
 
-%package -n python2-%{pypi_name}-tests
-Summary:          Python API and CLI for OpenStack Aodh Tests
-Requires:         python2-%{pypi_name} = %{version}-%{release}
-
-%description -n python2-%{pypi_name}-tests
-This is a client library for Aodh built on the Aodh API. It
-provides a Python API (the aodhclient module) and a command-line tool.
-
-
-%if 0%{?with_python3}
 %package -n python3-%{pypi_name}
 Summary:          Python API and CLI for OpenStack Aodh
 
@@ -98,7 +62,6 @@ Requires:         python3-%{pypi_name} = %{version}-%{release}
 This is a client library for Aodh built on the Aodh API. It
 provides a Python API (the aodhclient module) and a command-line tool.
 
-%endif
 
 %prep
 %setup -q -n %{pypi_name}-%{upstream_version}
@@ -108,61 +71,35 @@ rm -f {,test-}requirements.txt
 
 
 %build
-%py2_build
-%if 0%{?with_python3}
 %py3_build
-%endif
 
 %install
-%if 0%{?with_python3}
 %py3_install
-mv %{buildroot}%{_bindir}/aodh %{buildroot}%{_bindir}/aodh-%{python3_version}
-ln -s ./aodh-%{python3_version} %{buildroot}%{_bindir}/aodh-3
-%endif
-
-%py2_install
-mv %{buildroot}%{_bindir}/aodh %{buildroot}%{_bindir}/aodh-%{python2_version}
-ln -s ./aodh-%{python2_version} %{buildroot}%{_bindir}/aodh-2
-
-ln -s ./aodh-2 %{buildroot}%{_bindir}/aodh
 
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
-sphinx-build -b html doc/source html
-
-%files -n python2-%{pypi_name}
-%doc README.rst
-%license LICENSE
-%{python2_sitelib}/aodhclient
-%{python2_sitelib}/*.egg-info
-%{_bindir}/aodh
-%{_bindir}/aodh-2
-%{_bindir}/aodh-%{python2_version}
-%exclude %{python2_sitelib}/aodhclient/tests
-
-%files -n python2-%{pypi_name}-tests
-%license LICENSE
-%{python2_sitelib}/aodhclient/tests
+sphinx-build-3 -b html doc/source html
 
-%if 0%{?with_python3}
 %files -n python3-%{pypi_name}
 %license LICENSE
 %doc README.rst
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/*.egg-info
-%{_bindir}/aodh-3
-%{_bindir}/aodh-%{python3_version}
+%{_bindir}/aodh
 %exclude %{python3_sitelib}/aodhclient/tests
 
 %files -n python3-%{pypi_name}-tests
 %license LICENSE
 %{python3_sitelib}/aodhclient/tests
-%endif
 
 %files doc
 %doc html
 %license LICENSE
 
 %changelog
+* Sun Oct 28 2018 Miro Hrončok <mhroncok@redhat.com> - 0.7.0-8
+- Subpackages python2-aodhclient, python2-aodhclient-tests have been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild