Rebuilt for Python 3.9

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1808355

.gitignore

@@ -8,3 +8,4 @@ greenlet-0.3.1.tar.gz
 /0.4.11.tar.gz
 /greenlet-0.4.12.tar.gz
 /greenlet-0.4.13.tar.gz
+/greenlet-0.4.14.tar.gz

0001-Don-t-clobber-r2-register-on-ppc64el.patch

@@ -1,26 +0,0 @@
-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
-

c644ca6823994b958e004b3e00b587723181b58e.patch

@@ -0,0 +1,48 @@
+From d05b62bb75e6a3e217435a1fe0f15a53e692898c Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Wed, 18 Mar 2020 15:09:33 +0100
+Subject: [PATCH] Port to Python 3.9
+
+On Python 3.9, define _Py_DEC_REFTOTAL which has been removed by:
+https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924
+
+Replace also PyEval_CallObjectWithKeywords() with PyObject_Call(),
+since PyEval_CallObjectWithKeywords() has been deprecated in
+Python 3.9 and PyObject_Call() has the same behavior. The only
+difference is that PyEval_CallObjectWithKeywords() can be called with
+args=NULL, but g_initialstub() ensures that args is not NULL.
+---
+ greenlet.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/greenlet.c b/greenlet.c
+index ec738b9..d37fc97 100644
+--- a/greenlet.c
++++ b/greenlet.c
+@@ -109,6 +109,16 @@ extern PyTypeObject PyGreenlet_Type;
+ #define GREENLET_USE_TRACING 1
+ #endif
+ 
++#ifndef _Py_DEC_REFTOTAL
++  /* _Py_DEC_REFTOTAL macro has been removed from Python 3.9 by:
++    https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 */
++#  ifdef Py_REF_DEBUG
++#    define _Py_DEC_REFTOTAL _Py_RefTotal--
++#  else
++#    define _Py_DEC_REFTOTAL
++#  endif
++#endif
++
+ /* Weak reference to the switching-to greenlet during the slp switch */
+ static PyGreenlet* volatile ts_target = NULL;
+ /* Strong reference to the switching from greenlet after the switch */
+@@ -820,8 +830,7 @@ static int GREENLET_NOINLINE(g_initialstub)(void* mark)
+ 			result = NULL;
+ 		} else {
+ 			/* call g.run(*args, **kwargs) */
+-			result = PyEval_CallObjectWithKeywords(
+-				run, args, kwargs);
++			result = PyObject_Call(run, args, kwargs);
+ 			Py_DECREF(args);
+ 			Py_XDECREF(kwargs);
+ 		}

python-greenlet.spec

@@ -1,14 +1,14 @@
 %global         modname greenlet
 
 Name:           python-%{modname}
-Version:        0.4.13
+Version:        0.4.14
-Release:        2%{?dist}
+Release:        8%{?dist}
 Summary:        Lightweight in-process concurrent programming
 License:        MIT
 URL:            https://github.com/python-greenlet/greenlet
 Source0:        %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
-# https://github.com/python-greenlet/greenlet/pull/120
+BuildRequires:  gcc-c++
-Patch0001:      0001-Don-t-clobber-r2-register-on-ppc64el.patch
+Patch1:         %{url}/commit/c644ca6823994b958e004b3e00b587723181b58e.patch
 
 %global _description \
 The greenlet package is a spin-off of Stackless, a version of CPython\
@@ -18,16 +18,6 @@ and are synchronized with data exchanges on "channels".
 
 %description %{_description}
 
-%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.
-
 %package -n     python3-%{modname}
 Summary:        %{summary}
 %{?python_provide:%python_provide python3-%{modname}}
@@ -38,16 +28,6 @@ BuildRequires:  python3-setuptools
 
 Python 3 version.
 
-%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.
-
 %package -n     python3-%{modname}-devel
 Summary:        C development headers for python3-%{modname}
 %{?python_provide:%python_provide python3-%{modname}-devel}
@@ -62,26 +42,14 @@ Python 3 version.
 %autosetup -n %{modname}-%{version} -p1
 
 %build
-%py2_build
 %py3_build
 
 %install
-%py2_install
 %py3_install
  
 %check
-%{__python2} setup.py test
 %{__python3} setup.py test
 
-%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}/
-
 %files -n python3-%{modname}
 %license LICENSE LICENSE.PSF
 %doc AUTHORS NEWS README.rst
@@ -92,6 +60,41 @@ Python 3 version.
 %{_includedir}/python%{python3_version}*/%{modname}/
 
 %changelog
+* 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
+
+* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.13-3
+- Rebuilt for Python 3.7
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (greenlet-0.4.13.tar.gz) = 883062b28c5df62bd34eef427406af2646048d3a6a2acefff81c0d5e280f8a189006e7e376bcc97b0dc313b8ffc975c6bc4f2d1637393c24b41c0e9c1790c26a
+SHA512 (greenlet-0.4.14.tar.gz) = c86802a0df56b78482b029a0eaf624ca8f14d0e704480b30a8a35e343b3e4a16e80b6f169a970a39935b39d56aafc25bada0738199818b5892ca398a809d54ef