From 77e1e3bc501cd3d3b719da2897eae6747210ef4e Mon Sep 17 00:00:00 2001
From: yatin <ykarel@redhat.com>
Date: Jan 31 2019 12:48:34 +0000
Subject: Remove python2 sub packages (#1627427)


---

diff --git a/python-oslo-context.spec b/python-oslo-context.spec
index 2ab0976..b52ee93 100644
--- a/python-oslo-context.spec
+++ b/python-oslo-context.spec
@@ -3,10 +3,6 @@
 %global pypi_name oslo.context
 %global pkg_name oslo-context
 
-%if 0%{?fedora} >= 24
-%global with_python3 1
-%endif
-
 %global common_desc \
 The OpenStack Oslo context library has helpers to maintain \
 useful information about a request context. \
@@ -15,7 +11,7 @@ WSGI pipeline and used by various modules such as logging.
 
 Name:           python-%{pkg_name}
 Version:        2.20.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        OpenStack Oslo Context library
 
 License:        ASL 2.0
@@ -24,47 +20,21 @@ Source0:        https://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstr
 
 BuildArch:      noarch
 
-%package -n python2-%{pkg_name}
-Summary:        OpenStack Oslo Context library
-%{?python_provide:%python_provide python2-%{pkg_name}}
-
-BuildRequires:  python2-devel
-BuildRequires:  python2-pbr
 BuildRequires:  git
 
-# test dependencies
-# FIXME(hguemar): required or tests will fail
-# should be unnecessary with Rocky version
-BuildRequires:  python-unversioned-command
-BuildRequires:  python2-hacking
-BuildRequires:  python2-oslotest
-
-Requires:       python2-debtcollector >= 1.2.0
-Requires:       python2-pbr
-
-%description -n python2-%{pkg_name}
+%description
 %{common_desc}
 
-%package -n python-%{pkg_name}-tests
-Summary:   Tests for OpenStack Oslo context library
-
-Requires:  python-%{pkg_name} = %{version}-%{release}
-
-%description -n python-%{pkg_name}-tests
-Tests for OpenStack Oslo context library
-
 %package -n python-%{pkg_name}-doc
 Summary:        Documentation for the OpenStack Oslo context library
 
-BuildRequires:  python2-sphinx
-BuildRequires:  python2-openstackdocstheme
-BuildRequires:  python2-fixtures
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-openstackdocstheme
+BuildRequires:  python3-fixtures
 
 %description -n python-%{pkg_name}-doc
 Documentation for the OpenStack Oslo context library.
 
-# python3
-%if 0%{?with_python3}
 %package -n python3-%{pkg_name}
 Summary:        OpenStack Oslo Context library
 %{?python_provide:%python_provide python3-%{pkg_name}}
@@ -81,9 +51,6 @@ Requires:       python3-pbr
 %description -n python3-%{pkg_name}
 %{common_desc}
 
-%endif
-
-%if 0%{?with_python3}
 %package -n python3-%{pkg_name}-tests
 Summary:   Tests for OpenStack Oslo context library
 
@@ -91,73 +58,45 @@ Requires:  python3-%{pkg_name} = %{version}-%{release}
 
 %description -n python3-%{pkg_name}-tests
 Tests for OpenStack Oslo context library
-%endif
-
-%description
-%{common_desc}
 
 %prep
 %autosetup -n %{pypi_name}-%{upstream_version} -S git
 rm -rf {,test-}requirements.txt
 
 %build
-%py2_build
-
+%py3_build
 # doc
-%{__python2} setup.py build_sphinx
+%{__python3} setup.py build_sphinx
 # Remove the sphinx-build leftovers
 rm -fr doc/build/html/.{doctrees,buildinfo}
 
-%if 0%{?with_python3}
-%py3_build
-%endif
 
 %install
-%py2_install
-
-%if 0%{?with_python3}
 %py3_install
-%endif
 
 %check
-%{__python2} setup.py test
-%if 0%{?with_python3}
-rm -rf .testrepository
+export PYTHON=%{__python3}
 %{__python3} setup.py test
-%endif
-
 
-%files -n python2-%{pkg_name}
-%license LICENSE
-%doc README.rst
-%{python2_sitelib}/oslo_context
-%{python2_sitelib}/*.egg-info
-%exclude %{python2_sitelib}/oslo_context/tests
-
-%if 0%{?with_python3}
 %files -n python3-%{pkg_name}
 %license LICENSE
 %doc README.rst
 %{python3_sitelib}/oslo_context
 %{python3_sitelib}/*.egg-info
 %exclude %{python3_sitelib}/oslo_context/tests
-%endif
 
 %files -n python-%{pkg_name}-doc
 %license LICENSE
 %doc doc/build/html
 
-%files -n python-%{pkg_name}-tests
-%license LICENSE
-%{python2_sitelib}/oslo_context/tests
-
-%if 0%{?with_python3}
 %files -n python3-%{pkg_name}-tests
 %license LICENSE
 %{python3_sitelib}/oslo_context/tests
-%endif
 
 %changelog
+* Thu Jan 31 2019 Yatin Karel <ykarel@redhat.com> - 2.20.0-2
+- Remove python2 sub packages (#1627427)
+
 * Sat Feb 10 2018 RDO <dev@lists.rdoproject.org> 2.20.0-1
 - Update to 2.20.0