'unittest2' functionality already in py 2.7 and 3.x

diff --git a/python-kombu.spec b/python-kombu.spec
index 352a42cd956a81562b674f8af4b807ccc09615e5..774ac9eee69eea2c64c58a9e63e347e314b8169c 100644 (file)
--- a/python-kombu.spec
+++ b/python-kombu.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_without doc     # don't build doc
-%bcond_with    tests   # do perform "make test"
+%bcond_with    tests   # do perform tests
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
 
@@ -14,6 +14,7 @@ License:      BSD-like
 Group:         Development/Languages/Python
 Source0:       http://pypi.python.org/packages/source/k/%{module}/%{module}-%{version}.tar.gz
 # Source0-md5: 892bf89ee247c0d16d2bdd63f1ddf4c5
+Patch0:                unittest2.patch
 URL:           http://pypi.python.org/pypi/kombu
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.612
@@ -21,7 +22,7 @@ BuildRequires:        rpmbuild(macros) >= 1.612
 BuildRequires: python-setuptools
 %if %{with tests}
 BuildRequires: python-mock
-BuildRequires: python-modules
+BuildRequires: python-modules > 1:2.7
 BuildRequires: python-nose
 %endif
 %if %{with doc}
@@ -35,7 +36,6 @@ BuildRequires:        python3-setuptools
 %if %{with tests}
 BuildRequires: python3-mock
 BuildRequires: python3-nose
-BuildRequires: python3-unittest2
 %endif
 %endif
 Requires:      python-amqp >= 1.4.7
@@ -72,6 +72,8 @@ Dokumentacja API %{module}.
 %prep
 %setup -q -n %{module}-%{version}
 
+%patch0 -p1
+
 %build
 %if %{with python2}
 %{__python} setup.py build --build-base build-2 %{?with_tests:test}

diff --git a/unittest2.patch b/unittest2.patch
new file mode 100644 (file)
index 0000000..26da838
--- /dev/null
+++ b/unittest2.patch
@@ -0,0 +1,7 @@
+diff -dur kombu-3.0.29.orig/requirements/test.txt kombu-3.0.29/requirements/test.txt
+--- kombu-3.0.29.orig/requirements/test.txt    2015-09-29 23:47:57.000000000 +0200
++++ kombu-3.0.29/requirements/test.txt 2015-11-17 09:33:19.000000000 +0100
+@@ -1,3 +1,2 @@
+ nose
+-unittest2>=0.5.0
+ mock