From 71fb5d43decde6f1dc58d274cd6f8921790f39fb Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Feb 15 2019 12:03:51 +0000
Subject: Remove python2 subpackages


Required for FC30.

---

diff --git a/python-keystoneauth1.spec b/python-keystoneauth1.spec
index 9704eac..097c436 100644
--- a/python-keystoneauth1.spec
+++ b/python-keystoneauth1.spec
@@ -8,15 +8,11 @@ within the OpenStack ecosystem. It is designed for use in conjunction with \
 the existing OpenStack clients and for simplifying the process of writing \
 new clients.
 
-%if 0%{?fedora} >= 24
-%global with_python3 1
-%endif
-
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 
 Name:       python-%{pypi_name}
 Version:    3.4.0
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Authentication Library for OpenStack Clients
 License:    ASL 2.0
 URL:        https://pypi.io/pypi/%{pypi_name}
@@ -27,47 +23,6 @@ BuildArch:  noarch
 %description
 %{common_desc}
 
-%package -n     python2-%{pypi_name}
-Summary:        Authentication Libarary for OpenStack Identity
-Provides:       python-%{pypi_name} = %{version}-%{release}
-Provides:       python-keystoneauth = %{version}-%{release}
-
-BuildRequires: git
-BuildRequires: python2-devel
-BuildRequires: python2-setuptools
-BuildRequires: python2-six
-BuildRequires: python2-pbr >= 2.0.0
-
-# test requires
-BuildRequires: python2-betamax >= 0.7.0
-BuildRequires: python2-fixtures >= 1.3.1
-BuildRequires: python2-oslotest
-BuildRequires: python2-oslo-utils
-BuildRequires: python2-os-testr
-%if 0%{?fedora} || 0%{?rhel} > 7
-BuildRequires: python2-pyyaml
-BuildRequires: python2-lxml
-BuildRequires: python2-requests-kerberos
-BuildRequires: python2-requests-mock >= 1.1
-BuildRequires: python2-oauthlib
-%else
-BuildRequires: PyYAML
-BuildRequires: python-lxml
-BuildRequires: python-requests-kerberos
-BuildRequires: python-requests-mock >= 1.1
-BuildRequires: python-oauthlib
-%endif
-
-Requires:      python2-iso8601 >= 0.1.11
-Requires:      python2-pbr >= 2.0.0
-Requires:      python2-requests >= 2.14.2
-Requires:      python2-six => 1.10.0
-Requires:      python2-stevedore >= 1.20.0
-
-%description -n python2-%{pypi_name}
-%{common_desc}
-
-%if 0%{?with_python3}
 %package -n     python3-%{pypi_name}
 Summary:        Authentication Libarary for OpenStack Identity
 Provides:       python3-keystoneauth = %{version}-%{release}
@@ -96,30 +51,6 @@ Requires:      python3-stevedore >= 1.20.0
 
 %description -n python3-%{pypi_name}
 %{common_desc}
-%endif
-
-%if 0%{?fedora} == 0
-%package doc
-Summary:    Documentation for OpenStack Identity Authentication Library
-
-BuildRequires: python2-sphinx
-BuildRequires: python2-openstackdocstheme
-BuildRequires: python2-mock
-BuildRequires: python2-requests
-BuildRequires: python2-mox3
-BuildRequires: python2-oslo-config
-BuildRequires: python2-stevedore
-BuildRequires: python2-iso8601
-BuildRequires: python2-fixtures
-%if 0%{?fedora} || 0%{?rhel} > 7
-BuildRequires: python2-pep8
-%else
-BuildRequires: python-pep8
-%endif
-
-%description doc
-Documentation for OpenStack Identity Authentication Library
-%endif
 
 %prep
 %autosetup -n %{pypi_name}-%{upstream_version} -S git
@@ -132,22 +63,10 @@ rm -rf {test-,}requirements.txt
 rm -rf %{pypi_name}.egg-info
 
 %build
-%py2_build
-%if 0%{?with_python3}
 %py3_build
-%endif
 
 %install
-%py2_install
-%if 0%{?with_python3}
 %py3_install
-%endif
-
-%if 0%{?fedora} == 0
-# generate html docs
-%{__python} setup.py build_sphinx -b html
-rm -rf doc/build/html/.buildinfo
-%endif
 
 %check
 # keystoneauth upstream switched to stestr
@@ -158,27 +77,16 @@ rm -rf doc/build/html/.buildinfo
 #%{__python3} /usr/bin/ostestr
 #%endif
 
-%files -n python2-%{pypi_name}
-%doc README.rst
-%license LICENSE
-%{python2_sitelib}/%{pypi_name}
-%{python2_sitelib}/*.egg-info
-
-%if 0%{?with_python3}
 %files -n python3-%{pypi_name}
 %doc README.rst
 %license LICENSE
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/*.egg-info
-%endif
-
-%if 0%{?fedora} == 0
-%files doc
-%license LICENSE
-%doc doc/build/html
-%endif
 
 %changelog
+* Fri Feb 15 2019 Alfredo Moralejo <amoralej@redhat.com> - 3.4.0-5
+- Remove python2 subpackages.
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild