Update to 1.0.9.

Use BR on python-setuptools instead of python-setuptools-devel.
Create Python3 subpackage.
Fix dependencies.

3 files changed, 80 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index b06372b..2fbca32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /execnet-1.0.6.tar.gz
 /execnet-1.0.7.tar.gz
 /execnet-1.0.8.tar.gz
+/execnet-1.0.9.zip
diff --git a/python-execnet.spec b/python-execnet.spec
index 3872784..4fa2cba 100644
--- a/python-execnet.spec
+++ b/python-execnet.spec
@@ -1,22 +1,34 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if (! 0%{?rhel}) || 0%{?rhel} > 6
+%global with_python3 1
+%global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")
+%endif
+%if 0%{?rhel} && 0%{?rhel} < 6
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
 
 %global srcname execnet
 
 Name:           python-%{srcname}
-Version:        1.0.8
-Release:        1%{?rctag:.%rctag}%{?dist}.1
+Version:        1.0.9
+Release:        1%{?dist}
 Summary:        Elastic Python Deployment
 Group:          Development/Languages
 License:        GPLv2+ and MIT
 URL:            http://codespeak.net/execnet
-Source0:        http://pypi.python.org/packages/source/e/%{srcname}/%{srcname}-%{version}%{?rctag:%rctag}.tar.gz
+Source0:        http://pypi.python.org/packages/source/e/%{srcname}/%{srcname}-%{version}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools-devel
+BuildRequires:  python-setuptools
+Requires:       python-setuptools
+BuildRequires:  pytest
 BuildRequires:  python-sphinx
+%if 0%{?with_python3}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+BuildRequires:  python3-pytest
+%endif # with_python3
 # execnet was separated from pylib at that point
-BuildRequires:  python-py >= 1.2.0
 Conflicts:      python-py < 1.1.0
 
 
@@ -33,30 +45,73 @@ enables interoperation between CPython 2.4-3.1, Jython 2.5 and PyPy
 1.1 and works well on Windows, Linux and OSX systems.
 
 
+%if 0%{?with_python3}
+%package -n python3-execnet
+Summary:        Elastic Python Deployment
+Group:          Development/Languages
+Requires:       python3-setuptools
+
+
+%description -n python3-execnet
+The execnet package allows to:
+
+ * instantiate local/remote Python Interpreters
+ * send code for execution to one or many Interpreters
+ * send and receive data between codeInterpreters through channels
+
+execnet performs zero-install bootstrapping into other interpreters;
+package installation is only required at the initiating side. execnet
+enables interoperation between CPython 2.4-3.1, Jython 2.5 and PyPy
+1.1 and works well on Windows, Linux and OSX systems.
+%endif # with_python3
+
+
 %prep
-%setup -q -n %{srcname}-%{version}%{?rctag}
+%setup -q -n %{srcname}-%{version}
 
 # remove shebangs and fix permissions
 find . -type f -a \( -name '*.py' -o -name 'py.*' \) \
    -exec sed -i '1{/^#!/d}' {} \; \
    -exec chmod u=rw,go=r {} \;
 
+%if 0%{?with_python3}
+cp -a . %{py3dir}
+%endif # with_python3
+
 
 %build
 %{__python} setup.py build
 make -C doc html
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
+
 
 %install
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+popd
+%endif # with_python3
+
 # remove hidden file
 rm doc/_build/html/.buildinfo
 
 
 %check
-PYTHONPATH=$(pwd) py.test --report=skipped
+PYTHONPATH=$(pwd) py.test-%{python_version} --report=skipped
+%if 0%{?with_python3}
+pushd %{py3dir}
+PYTHONPATH=$(pwd) py.test-%{python3_version} --report=skipped
+popd
+%endif # with_python3
+
 
 %clean
 rm -rf %{buildroot}
@@ -69,7 +124,22 @@ rm -rf %{buildroot}
 %doc doc/_build/html
 
 
+%if 0%{?with_python3}
+%files -n python3-execnet
+%defattr(-,root,root,-)
+%{python3_sitelib}/%{srcname}*
+%doc README.txt LICENSE CHANGELOG
+%doc doc/_build/html
+%endif # with_python3
+
+
 %changelog
+* Sun Sep  4 2011 Thomas Moschny <thomas.moschny@gmx.de> - 1.0.9-1
+- Update to 1.0.9.
+- Use BR on python-setuptools instead of python-setuptools-devel.
+- Create Python3 subpackage.
+- Fix dependencies.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 438a00c..72fa0a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-381edc6b52050dc9853ec1b8d7daa19f  execnet-1.0.8.tar.gz
+ecd392001c62766c2dbf8adaf2fb7dc5  execnet-1.0.9.zip