Version: 3.5.0.4

diff --git a/python-billiard.spec b/python-billiard.spec
index e9016075c9a44731b44f28bd703847ac00f11bfc..f61e88fc2e3d7301acab8439d04e33abed3cdac1 100644 (file)
--- a/python-billiard.spec
+++ b/python-billiard.spec
@@ -1,20 +1,19 @@
 #
 # Conditional build:
 %bcond_without doc     # don't build doc
-%bcond_without tests   # do not perform "make test"
+%bcond_with    tests   # do perform "make test" (downloads external code)
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
 
 %define        module  billiard
 Summary:       Multiprocessing Pool Extensions
 Name:          python-%{module}
-Version:       3.3.0.21
-Release:       6
+Version:       3.5.0.4
+Release:       1
 License:       BSD
 Group:         Libraries/Python
 Source0:       https://pypi.python.org/packages/source/b/billiard/%{module}-%{version}.tar.gz
-# Source0-md5: 5304a48344d8f7e821d06f57da8af1f4
-Patch0:                unittest2.patch
+# Source0-md5: e9558e6969b6e3f48891c2122f365c60
 URL:           https://github.com/celery/billiard
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.710
@@ -75,7 +74,6 @@ Dokumentacja API %{module}.
 
 %prep
 %setup -q -n %{module}-%{version}
-%patch0 -p1
 
 %build
 %if %{with python2}
@@ -121,10 +119,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/%{module}/*.py[co]
 %dir %{py_sitedir}/%{module}/dummy
 %{py_sitedir}/%{module}/dummy/*.py[co]
-%dir %{py_sitedir}/%{module}/py2
-%{py_sitedir}/%{module}/py2/*.py[co]
-%dir %{py_sitedir}/%{module}/tests
-%{py_sitedir}/%{module}/tests/*.py[co]
 %{py_sitedir}/_%{module}.so
 %{py_sitedir}/%{module}-%{version}-py*.egg-info
 %endif

diff --git a/unittest2.patch b/unittest2.patch
deleted file mode 100644 (file)
index cb3741e..0000000
--- a/unittest2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -dur billiard-3.3.0.21.orig/funtests/setup.py billiard-3.3.0.21/funtests/setup.py
---- billiard-3.3.0.21.orig/funtests/setup.py   2015-09-09 20:37:15.000000000 +0200
-+++ billiard-3.3.0.21/funtests/setup.py        2015-11-17 08:44:07.000000000 +0100
-@@ -44,7 +44,6 @@
-     test_suite='nose.collector',
-     build_requires=[
-         'nose',
--        'unittest2',
-         'coverage>=3.0',
-     ],
-     classifiers=[
-diff -dur billiard-3.3.0.21.orig/requirements/test.txt billiard-3.3.0.21/requirements/test.txt
---- billiard-3.3.0.21.orig/requirements/test.txt       2015-09-09 20:37:15.000000000 +0200
-+++ billiard-3.3.0.21/requirements/test.txt    2015-11-17 08:43:51.000000000 +0100
-@@ -1,3 +1,2 @@
--unittest2>=0.4.0
- nose>=1.3.4
- mock