From 50985fef8574a2fff2782892abd8742a907655be Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Jan 04 2021 10:52:59 +0000
Subject: Cleanse Python 2 bits of the spec file


---

diff --git a/python-httplib2.spec b/python-httplib2.spec
index b58962c..68360d0 100644
--- a/python-httplib2.spec
+++ b/python-httplib2.spec
@@ -14,29 +14,12 @@ Patch1:         python-%{srcname}.certfile.patch
 
 BuildArch:      noarch
 
-# Don't build for Python 2 on Fedora 34+ and RHEL
-%if 0%{?fedora} > 33 || 0%{?rhel}
-%bcond_with python2
-%else
-%bcond_without python2
-%endif
-
 %global _description\
 A comprehensive HTTP client library that supports many features left out of\
 other HTTP libraries.
 
 %description %{_description}
 
-%if %{with python2}
-%package -n python2-%{srcname}
-Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{srcname}}
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-devel
-
-%description -n python2-%{srcname} %{_description}
-%endif
-
 %package -n python3-%{srcname}
 Summary:        %{summary}
 %{?python_provide:%python_provide python3-%{srcname}}
@@ -54,48 +37,22 @@ BuildRequires:  python3-mock
 
 
 %prep
-# The implementation is different for each major Python version
-# and we need to install from separate directories
-%setup -qc
-pushd %{srcname}-%{version}
-%autopatch -p1
+%autosetup -p1 -n %{srcname}-%{version}
+rm -r python2
 
 # Drop coverage
 sed -i '/--cov/d' setup.cfg
-popd
-
-cp -a %{srcname}-%{version} python2
-mv %{srcname}-%{version} python3
-rm -r python2/python3
-rm -r python3/python2
 
 
 %build
-%if %{with python2}
-pushd python2
-%py2_build
-popd
-%endif
-
-pushd python3
 %py3_build
-popd
 
 
 %install
-%if %{with python2}
-pushd python2
-%py2_install
-popd
-%endif
-
-pushd python3
 %py3_install
-popd
 
 
 %check
-pushd python3
 PYTHONPATH=%{buildroot}%{python3_sitelib} pytest -k "not test_unknown_server \
 	and not test_socks5_auth and not \
 	test_server_not_found_error_is_raised_for_invalid_hostname and not \
@@ -105,24 +62,16 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest -k "not test_unknown_server \
 	test_get_301_via_https and not test_client_cert_password_verified and not\
 	test_get_via_https and not test_min_tls_version and not\
 	test_client_cert_verified"
-popd
-
 
-%if %{with python2}
-%files -n python2-%{srcname}
-%doc python2/README.md
-%{python2_sitelib}/%{srcname}-*.egg-info/
-%{python2_sitelib}/%{srcname}/
-%endif
 
 %files -n python3-%{srcname}
-%doc python3/README.md
+%doc README.md
 %{python3_sitelib}/%{srcname}-*.egg-info/
 %{python3_sitelib}/%{srcname}/
 
 %changelog
 * Sat Jan 02 2021 Miro Hrončok <mhroncok@redhat.com> - 0.18.1-9
-- Disable Python 2 build on Fedora 34+
+- Disable Python 2 build entirely
 
 * Tue Nov 24 2020 Miro Hrončok <mhroncok@redhat.com> - 0.18.1-8
 - Disable Python 2 build on RHEL 9+