Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/python-httplib2.git#6c87427e07bf73c62edbe2c5ecfbbcaadcb385e9

python-httplib2.spec

@@ -2,7 +2,7 @@
 
 Name:           python-%{srcname}
 Version:        0.18.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Comprehensive HTTP client library
 License:        MIT
 URL:            https://pypi.python.org/pypi/httplib2
@@ -14,12 +14,21 @@ Patch1:         python-%{srcname}.certfile.patch
 
 BuildArch:      noarch
 
+# There is an exception to ship python2-httplib2 on Fedora, for trac-spamfilter-plugin:
+# https://pagure.io/fesco/issue/2266
+%if 0%{?fedora}
+%bcond_without python2
+%else
+%bcond_with 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}}
@@ -27,6 +36,7 @@ BuildRequires:  python2-setuptools
 BuildRequires:  python2-devel
 
 %description -n python2-%{srcname} %{_description}
+%endif
 
 %package -n python3-%{srcname}
 Summary:        %{summary}
@@ -62,9 +72,11 @@ rm -r python3/python2
 
 
 %build
+%if %{with python2}
 pushd python2
 %py2_build
 popd
+%endif
 
 pushd python3
 %py3_build
@@ -72,9 +84,11 @@ popd
 
 
 %install
+%if %{with python2}
 pushd python2
 %py2_install
 popd
+%endif
 
 pushd python3
 %py3_install
@@ -95,10 +109,12 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest -k "not test_unknown_server \
 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
@@ -106,6 +122,9 @@ popd
 %{python3_sitelib}/%{srcname}/
 
 %changelog
+* Tue Nov 24 2020 Miro Hrončok <mhroncok@redhat.com> - 0.18.1-8
+- Disable Python 2 build on RHEL 9+
+
 * Fri Sep 04 2020 Joel Capitao <jcapitao@redhat.com> - 0.18.1-7
 - Remove unused BR