4 changed files with 91 additions and 68 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/greenlet-1.1.2.tar.gz
+SOURCES/greenlet-0.4.13.tar.gz
--- a/.python-greenlet.metadata
+++ b/.python-greenlet.metadata
@ -1 +1 @@
-959222fc19fffb3849dd50f08aa5fa59ae7e659f SOURCES/greenlet-1.1.2.tar.gz
+105fcc7bae9e388e4b9a05b7c431ad2a637a0f75 SOURCES/greenlet-0.4.13.tar.gz
--- a/SOURCES/0001-Don-t-clobber-r2-register-on-ppc64el.patch
+++ b/SOURCES/0001-Don-t-clobber-r2-register-on-ppc64el.patch
@ -0,0 +1,26 @@
+From d32e64abf2443ada592f6a1e5d74bee35db0f221 Mon Sep 17 00:00:00 2001
+From: "Laszlo Boszormenyi (GCS)" <gcs@debian.org>
+Date: Sat, 9 Sep 2017 07:57:16 +0000
+Subject: [PATCH] Don't clobber 'r2' register on ppc64el
+
+It was invalid even before, now GCC 7 no longer accept this.
+---
+ platform/switch_ppc64_linux.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/platform/switch_ppc64_linux.h b/platform/switch_ppc64_linux.h
+index 0f20756..cd7d748 100644
+--- a/platform/switch_ppc64_linux.h
+++ b/platform/switch_ppc64_linux.h
+@@ -56,7 +56,7 @@
+ #define ALTIVEC_REGS
+ #endif
+ 
+-#define REGS_TO_SAVE "r2", "r14", "r15", "r16", "r17", "r18", "r19", "r20", \
+#define REGS_TO_SAVE "r14", "r15", "r16", "r17", "r18", "r19", "r20", \
+        "r21", "r22", "r23", "r24", "r25", "r26", "r27", "r28", "r29", "r31", \
+        "fr14", "fr15", "fr16", "fr17", "fr18", "fr19", "fr20", "fr21", \
+        "fr22", "fr23", "fr24", "fr25", "fr26", "fr27", "fr28", "fr29", \
+-- 
+2.15.1
+
--- a/SPECS/python-greenlet.spec
+++ b/SPECS/python-greenlet.spec
@ -1,13 +1,21 @@
+%if 0%{?rhel} > 7
+# Disable python2 build by default
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+
 %global         modname greenlet

 Name:           python-%{modname}
-Version:        1.1.2
+Version:        0.4.13
 Release:        4%{?dist}
 Summary:        Lightweight in-process concurrent programming
 License:        MIT
 URL:            https://github.com/python-greenlet/greenlet
 Source0:        %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
-BuildRequires:  gcc-c++
+# https://github.com/python-greenlet/greenlet/pull/120
+Patch0001:      0001-Don-t-clobber-r2-register-on-ppc64el.patch

 %global _description \
 The greenlet package is a spin-off of Stackless, a version of CPython\
@ -17,6 +25,18 @@ and are synchronized with data exchanges on "channels".

 %description %{_description}

+%if %{with python2}
+%package -n     python2-%{modname}
+Summary:        %{summary}
+%{?python_provide:%python_provide python2-%{modname}}
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+
+%description -n python2-%{modname} %{_description}
+
+Python 2 version.
+%endif # with python2
+
 %package -n     python3-%{modname}
 Summary:        %{summary}
 %{?python_provide:%python_provide python3-%{modname}}
@ -27,6 +47,18 @@ BuildRequires:  python3-setuptools

 Python 3 version.

+%if %{with python2}
+%package -n     python2-%{modname}-devel
+Summary:        C development headers for python2-%{modname}
+%{?python_provide:%python_provide python2-%{modname}-devel}
+Requires:       python2-%{modname}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n python2-%{modname}-devel
+%{summary}.
+
+Python 2 version.
+%endif # with python2
+
 %package -n     python3-%{modname}-devel
 Summary:        C development headers for python3-%{modname}
 %{?python_provide:%python_provide python3-%{modname}-devel}
@ -41,85 +73,50 @@ Python 3 version.
 %autosetup -n %{modname}-%{version} -p1

 %build
+%if %{with python2}
+%py2_build
+%endif # with python2
 %py3_build

 %install
+%if %{with python2}
+%py2_install
+%endif # with python2
 %py3_install
-
+ 
 %check
-PYTHONPATH="%{buildroot}%{python3_sitearch}" %{python3} -m unittest discover greenlet.tests
+%if %{with python2}
+%{__python2} setup.py test
+%endif # with python2
+%{__python3} setup.py test
+
+%if %{with python2}
+%files -n python2-%{modname}
+%license LICENSE LICENSE.PSF
+%doc AUTHORS NEWS README.rst
+%{python2_sitearch}/%{modname}-*.egg-info
+%{python2_sitearch}/%{modname}.so
+
+%files -n python2-%{modname}-devel
+%{_includedir}/python%{python2_version}*/%{modname}/
+%endif # with python2

 %files -n python3-%{modname}
 %license LICENSE LICENSE.PSF
-%doc AUTHORS README.rst
+%doc AUTHORS NEWS README.rst
 %{python3_sitearch}/%{modname}-*.egg-info
-%{python3_sitearch}/%{modname}
+%{python3_sitearch}/%{modname}*.so

 %files -n python3-greenlet-devel
 %{_includedir}/python%{python3_version}*/%{modname}/

 %changelog
-* Tue May 09 2023 Brian C. Lane <bcl@redhat.com> - 1.1.2-4
- Bump release for move of -devel subpackage to CRB
-  Resolves: rhbz#2149497
-
-* Wed Jun 15 2022 Sergio Correia <scorreia@redhat.com> - 1.1.2-3
- Add python-greenlet to RHEL-9
-  Resolves: rhbz#2084555
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.4.17-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.4.17-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Oct 31 2020 Kevin Fenzi <kevin@scrye.com> - 0.4.17-1
- Update to 0.4.17. Fixes bug #1881455
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jun 06 2020 Orion Poplawski <orion@nwra.com> - 0.4.16-1
- Update to 0.4.16
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-8
- Rebuilt for Python 3.9
-
-* Thu May 21 2020 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-7
- Fix Python 3.9 build
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.14-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Sep 26 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-5
- Subpackages python2-greenlet, python2-greenlet-devel have been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-4
- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Jul 18 2018 Kevin Fenzi <kevin@scrye.com> - 0.4.14-1
- Update to 0.4.14.
- Drop upstreamed/no longer needed patches.
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.13-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 03 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.13-4
- Add fix for Python 3.7
+* Thu Nov 07 2019 Brian C. Lane <bcl@redhat.com> - 0.4.13-4
+- Add gating tests
+  Resolves: rhbz#1682344

-* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.13-3
- Rebuilt for Python 3.7
+* Wed Jul 18 2018 Charalampos Stratakis <cstratak@redhat.com> - 0.4.13-3
+- Conditionalize the python2 subpackage

 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild