Update to 1.1b5; Add python3 support

Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1244452
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

.gitignore

@@ -6,3 +6,4 @@ gevent-0.13.0.tar.gz
 /gevent-1.0.tar.gz
 /gevent-1.0.1.tar.gz
 /gevent-1.0.2.tar.gz
+/gevent-1.1b5.tar.gz

0002-remove-version-requirement-for-greenlet.patch

@@ -1,27 +0,0 @@
-From 8805203cabef9919b5e2173dab85bde762f1d842 Mon Sep 17 00:00:00 2001
-From: Dan Callaghan <dcallagh@redhat.com>
-Date: Fri, 26 Jun 2015 13:29:04 +1000
-Subject: [PATCH 2/2] remove version requirement for greenlet
-
-We currently have 0.4.5 in Fedora which is also fine (Python 2.5 support
-is not relevant for us).
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 1e7fbfa..5793eb9 100755
---- a/setup.py
-+++ b/setup.py
-@@ -307,7 +307,7 @@ def run_setup(ext_modules):
-         packages=['gevent'],
-         ext_modules=ext_modules,
-         cmdclass=dict(build_ext=my_build_ext, sdist=sdist),
--        install_requires=['greenlet>=0.4.7'],
-+        install_requires=['greenlet'],
-         classifiers=[
-             "License :: OSI Approved :: MIT License",
-             "Programming Language :: Python :: 2.5",
--- 
-1.9.3
-

python-gevent.spec

@@ -1,28 +1,20 @@
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ ^%{python3_sitearch}/.*\\.so$
+%global realver 1.1b5
+%global modname gevent
+%global optflags %(echo %{optflags} -I%{_includedir}/libev)
 
-%global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$
+Name:          python-%{modname}
+Version:       1.1
+Release:       0.1.b5%{?dist}
+Summary:       A coroutine-based Python networking library
 
-%global upstream_name gevent
+License:       MIT
+URL:           http://www.gevent.org/
+#Source0:       http://pypi.python.org/packages/source/g/%{modname}/%{modname}-%{version}.tar.gz
+Source0:       http://pypi.python.org/packages/source/g/%{modname}/%{modname}-%{realver}.tar.gz
 
-Name:           python-%{upstream_name}
+BuildRequires: c-ares-devel
-Version:        1.0.2
+BuildRequires: libev-devel
-Release:        2%{?dist}
-Summary:        A coroutine-based Python networking library
-
-Group:          Development/Languages
-License:        MIT
-URL:            http://www.gevent.org/
-Source0:        http://pypi.python.org/packages/source/g/gevent/gevent-%{version}.tar.gz
-
-# gevent requires greenlet >= 0.4.7 but we have 0.4.5 in Fedora.
-# The version requirement is only related to Python 2.5 support
-# so we are fine with any version.
-Patch2:         0002-remove-version-requirement-for-greenlet.patch
-
-BuildRequires:  python2-devel
-BuildRequires:  c-ares-devel
-BuildRequires:  libev-devel
-Requires:       python-greenlet
 
 %description
 gevent is a coroutine-based Python networking library that uses greenlet to
@@ -37,26 +29,65 @@ Features include:
   * DNS requests done through libevent-dns
   * monkey patching utility to get pure Python modules to cooperate
 
+%package -n python2-%{modname}
+Summary:       %{summary}
+%{?python_provide:%python_provide python2-%{modname}}
+BuildRequires: python2-devel
+Requires:      python-greenlet
+
+%description -n python2-%{modname}
+%{description}
+
+%package -n python3-%{modname}
+Summary:       %{summary}
+%{?python_provide:%python_provide python3-%{modname}}
+BuildRequires: python3-devel
+Requires:      python3-greenlet
+
+%description -n python3-%{modname}
+%{description}
+
 %prep
-%setup -q -n %{upstream_name}-%{version}
+%autosetup -n %{modname}-%{realver}
 # Remove bundled libraries
-rm -r c-ares libev
+rm -rf c-ares libev
-%patch2 -p1
+
+rm -rf %{py3dir}
+cp -a . %{py3dir}
 
 %build
-CFLAGS="%{optflags} -I%{_includedir}/libev" %{__python2} setup.py build
+%py2_build
+pushd %{py3dir}
+  %py3_build
+popd
 
 %install
-%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+%py2_install
-# Fix non-standard-executable-perm error
+pushd %{py3dir}
-%{__chmod} 0755 %{buildroot}%{python2_sitearch}/%{upstream_name}/core.so
+  %py3_install
+popd
+rm -f %{buildroot}%{python2_sitearch}/%{modname}/_*3.py
+rm -f %{buildroot}%{python3_sitearch}/%{modname}/_*2.py
+find %{buildroot} -name '.buildinfo' -delete
+# Correct the permissions.
+find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
 
-%files
+%files -n python2-%{modname}
-%doc LICENSE README.rst
+%license LICENSE
-%{python2_sitearch}/%{upstream_name}
+%doc README.rst
-%{python2_sitearch}/%{upstream_name}-%{version}-*.egg-info
+%{python2_sitearch}/%{modname}*
+
+%files -n python3-%{modname}
+%license LICENSE
+%doc README.rst
+%{python3_sitearch}/%{modname}*
 
 %changelog
+* Mon Oct 05 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1-0.1.b5
+- Update to 1.1b5 (RHBZ #1244452)
+- Add python3 support
+- Follow modern RPM packaging guidelines
+
 * Fri Jun 26 2015 Dan Callaghan <dcallagh@redhat.com> - 1.0.2-2
 - removed version requirement for greenlet
 

sources

@@ -1 +1 @@
-117f135d57ca7416203fba3720bf71c1  gevent-1.0.2.tar.gz
+e120a6672feecbbc38b2fe1757ae6099  gevent-1.1b5.tar.gz