.gitignore

@@ -1 +1 @@
-SOURCES/six-1.12.0.tar.gz
+SOURCES/six-1.11.0.tar.gz

.python-six.metadata

@@ -1 +1 @@
-1957b44942be21822414f4dde936e6c40b687565 SOURCES/six-1.12.0.tar.gz
+3647372a0e104e7b53bd477762392024e1083ac0 SOURCES/six-1.11.0.tar.gz

SPECS/python-six.spec

@@ -1,16 +1,18 @@
 %global modname six
+%global build_wheel 1
+%global py2_wheel 0
 
-# tests are enabled by default, but on Fedora 32+, Python 2 tests are skipped
 %bcond_without tests
 
-# python2 is enabled by default, Fedora 32+ exception is anticipated
 %bcond_with python2
+%bcond_without python3
 
-%global python_wheelname %{modname}-%{version}-py2.py3-none-any.whl
+%global python2_wheelname %{modname}-%{version}-py2.py3-none-any.whl
+%global python3_wheelname %python2_wheelname
 
 Name:           python-%{modname}
-Version:        1.12.0
+Version:        1.11.0
-Release:        9%{?dist}
+Release:        8%{?dist}
 Summary:        Python 2 and 3 compatibility utilities
 
 License:        MIT
@@ -18,10 +20,6 @@ URL:            https://pypi.python.org/pypi/six
 Source0:        https://files.pythonhosted.org/packages/source/%(n=%{modname}; echo ${n:0:1})/%{modname}/%{modname}-%{version}.tar.gz
 
 BuildArch:      noarch
-# Exclude i686 arch. Due to a modularity issue it's being added to the
-# x86_64 compose of CRB, but we don't want to ship it at all.
-# See: https://projects.engineering.redhat.com/browse/RCM-72605
-ExcludeArch:    i686
 
 %global _description \
 %%{name} provides simple utilities for wrapping over differences between\
@@ -36,9 +34,14 @@ Summary:        %{summary}
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 
-%if %{with tests} && 0%{?fedora} < 32
+%if %{with tests}
 BuildRequires:  python2-pytest
-BuildRequires:  python2-tkinter
+#BuildRequires:  python2-tkinter
+%endif
+
+%if 0%{?py2_wheel}
+BuildRequires:  python2-pip
+BuildRequires:  python2-wheel
 %endif
 
 %description -n python2-%{modname} %{_description}
@@ -47,23 +50,29 @@ Python 2 version.
 %endif
 
 
-%package -n python%{python3_pkgversion}-%{modname}
+%if %{with python3}
+%package -n python3-%{modname}
 Summary:        %{summary}
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
+%{?python_provide:%python_provide python3-%{modname}}
-BuildRequires:  python%{python3_pkgversion}-devel
+Obsoletes:      platform-python-%{modname} < %{version}-%{release}
-BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python3-devel
-BuildRequires:  python%{python3_pkgversion}-pip
+BuildRequires:  python3-setuptools
-BuildRequires:  python%{python3_pkgversion}-wheel
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
 
 %if %{with tests}
-BuildRequires:  python%{python3_pkgversion}-pytest
+BuildRequires:  python3-pytest
-BuildRequires:  python%{python3_pkgversion}-tkinter
+BuildRequires:  python3-tkinter
 %endif
 
-%description -n python%{python3_pkgversion}-%{modname} %{_description}
+%if 0%{?build_wheel}
+BuildRequires:  python%{python3_pkgversion}-pip
+BuildRequires:  python%{python3_pkgversion}-wheel
+%endif
+
+%description -n python3-%{modname} %{_description}
 Python 3 version.
 
+%endif
+
 
 %prep
 %autosetup -n %{modname}-%{version}
@@ -71,25 +80,49 @@ Python 3 version.
 
 %build
 %if %{with python2}
+export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
+%if 0%{?py2_wheel}
+%py2_build_wheel
+%else
 %py2_build
 %endif
+%endif
 
+%if %{with python3}
+%if 0%{?build_wheel}
 %py3_build_wheel
+%else
+%py3_build
+%endif
+%endif
 
 
 %install
 %if %{with python2}
+export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
+%if 0%{?py2_wheel}
+%py2_install_wheel %{python2_wheelname}
+%else
 %py2_install
 %endif
+%endif
+
+%if %{with python3}
+%if 0%{?build_wheel}
+%py3_install_wheel %{python3_wheelname}
+%else
+%py3_install
+%endif
+%endif
 
-%py3_install_wheel %{python_wheelname}
 
 %if %{with tests}
 %check
-%if %{with python2} && 0%{?fedora} < 32
+%if %{with python2}
-PYTHONPATH=%{buildroot}%{python2_sitelib} py.test-2 -rfsxX test_six.py
+export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
-%endif
+py.test-2 -rfsxX test_six.py
-PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -rfsxX test_six.py
+%endif #{with python2}
+py.test-3 -rfsxX test_six.py
 %endif
 
 
@@ -97,54 +130,37 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -rfsxX test
 %files -n python2-%{modname}
 %license LICENSE
 %doc README.rst documentation/index.rst
-%{python2_sitelib}/%{modname}-*.egg-info/
+%{python2_sitelib}/%{modname}-*.*-info/
 %{python2_sitelib}/%{modname}.py*
 %endif
 
-%files -n python%{python3_pkgversion}-%{modname}
+%if %{with python3}
+%files -n python3-%{modname}
 %license LICENSE
 %doc README.rst documentation/index.rst
 %{python3_sitelib}/%{modname}-*.dist-info/
 %{python3_sitelib}/%{modname}.py
 %{python3_sitelib}/__pycache__/%{modname}.*
+%endif
 
 
 %changelog
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.12.0-9
+* Fri Jul 13 2018 Petr Viktorin <pviktori@redhat.com> - 1.11.0-8
-- Exclude unsupported i686 arch
+- Disable the Python 2 subpackage
+  https://bugzilla.redhat.com/show_bug.cgi?id=1594157
 
-* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.12.0-8
+* Wed Jun 27 2018 Petr Viktorin <pviktori@redhat.com> - 1.11.0-7
-- Adjusted for Python 3.8 module in RHEL 8
+- Drop dependency on python2-tkinter
+  This results in one skipped test.
 
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.0-7
+* Fri Jun 22 2018 Petr Viktorin <pviktori@redhat.com> - 1.11.0-6
-- Rebuilt for Python 3.8.0rc1 (#1748018)
+- Do not use wheel on Python 2
 
-* Mon Aug 26 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.0-6
+* Fri Jun 22 2018 Petr Viktorin <pviktori@redhat.com> - 1.11.0-5
-- Reduce Python 2 build dependencies
+- Conditionalize bulding wheel on Python 2
 
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.0-5
+* Thu Jun 21 2018 Lumír Balhar <lbalhar@redhat.com> - 1.11.0-4
-- Rebuilt for Python 3.8
+- Allow build with Python 2
-
-* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.0-4
-- Bootstrap for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Feb 13 2019 Yatin Karel <ykarel@redhat.com> - 1.12.0-1
-- Update to 1.12.0
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 1.11.0-5
-- Rebuilt for Python 3.7
-
-* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 1.11.0-4
-- Bootstrap for Python 3.7
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild