Update to 1.2.0.

- Update license.
- Modernize spec file.
- Remove patch not needed anymore.
- Update build requirements.
- Only run tests in 'testing'.

3 files changed, 30 insertions, 24 deletions

diff --git a/.gitignore b/.gitignore
index 56df1ad..952a824 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /execnet-1.0.8.tar.gz
 /execnet-1.0.9.zip
 /execnet-1.1.zip
+/execnet-1.2.0.tar.gz
diff --git a/python-execnet.spec b/python-execnet.spec
index 30ff235..9f6cd5b 100644
--- a/python-execnet.spec
+++ b/python-execnet.spec
@@ -1,24 +1,23 @@
-%if (! 0%{?rhel}) || 0%{?rhel} > 6
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+%if 0%{?fedora}
 %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())")}
+%{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")}
 %endif
 
 %global srcname execnet
 
 Name:           python-%{srcname}
-Version:        1.1
-Release:        6%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Elastic Python Deployment
 Group:          Development/Languages
-License:        GPLv2+ and MIT
+# package is now under the MIT license, (although the docs still say
+# otherwise, see https://bitbucket.org/hpk42/execnet/issue/33), and
+# one example file (doc/example/sysinfo.py) is GPLv2+
+License:        MIT and GPLv2+
 URL:            http://codespeak.net/execnet
-Source0:        http://pypi.python.org/packages/source/e/%{srcname}/%{srcname}-%{version}.zip
-# see https://bitbucket.org/hpk42/execnet/issue/9
-Patch0:         execnet-1.1-issue9.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        http://pypi.python.org/packages/source/e/%{srcname}/%{srcname}-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
@@ -26,10 +25,15 @@ Requires:       python-setuptools
 BuildRequires:  pytest
 BuildRequires:  python-sphinx
 BuildRequires:  /bin/ps
+BuildRequires:  python-eventlet
+BuildRequires:  python-gevent >= 1.0
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-pytest
+# these do not exist
+#BuildRequires:  python3-eventlet
+#BuildRequires:  python3-gevent
 %endif # with_python3
 # execnet was separated from pylib at that point
 Conflicts:      python-py < 1.1.0
@@ -67,7 +71,6 @@ minimal and fast API targetting the following uses:
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1
 
 # remove shebangs and fix permissions
 find . -type f -a \( -name '*.py' -o -name 'py.*' \) \
@@ -91,7 +94,6 @@ popd
 
 
 %install
-rm -rf %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %if 0%{?with_python3}
@@ -105,21 +107,17 @@ rm doc/_build/html/.buildinfo
 
 
 %check
-PYTHONPATH=$(pwd) py.test-%{python_version} -r s
+PYTHONPATH=$(pwd) LC_ALL="en_US.UTF-8" \
+py.test-%{python_version} -r s testing
 %if 0%{?with_python3}
 pushd %{py3dir}
-# see https://bitbucket.org/hpk42/execnet/issue/16
-PYTHONPATH=$(pwd) py.test-%{python3_version} -k 'not(proxy)' -r s
+PYTHONPATH=$(pwd) LC_ALL="en_US.UTF-8" \
+py.test-%{python3_version} -r s testing
 popd
 %endif # with_python3
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{python_sitelib}/%{srcname}*
 %doc README.txt LICENSE CHANGELOG
 %doc doc/_build/html
@@ -127,7 +125,6 @@ rm -rf %{buildroot}
 
 %if 0%{?with_python3}
 %files -n python3-execnet
-%defattr(-,root,root,-)
 %{python3_sitelib}/%{srcname}*
 %doc README.txt LICENSE CHANGELOG
 %doc doc/_build/html
@@ -135,6 +132,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Apr 18 2014 Thomas Moschny <thomas.moschny@gmx.de> - 1.2.0-1
+- Update to 1.2.0.
+- Update license.
+- Modernize spec file.
+- Remove patch not needed anymore.
+- Update build requirements.
+- Only run tests in 'testing'.
+
 * Sun Aug 18 2013 Thomas Moschny <thomas.moschny@gmx.de> - 1.1-6
 - Fixing FTBFS (rhbz#992888, rhbz#914405): Add patch for failing
   tests, disable other failing tests for now.
diff --git a/sources b/sources
index 93176f6..8a9602a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be885ccd9612966bb81839670d2da099  execnet-1.1.zip
+1886d12726b912fc2fd05dfccd7e6432  execnet-1.2.0.tar.gz