diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+
+ test
+
diff --git a/python-pyquery.changes b/python-pyquery.changes
index 474c5dd..0763522 100644
--- a/python-pyquery.changes
+++ b/python-pyquery.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Feb 25 09:00:58 UTC 2019 - Tomáš Chvátal
+
+- Use _multibuild to run tests
+
+-------------------------------------------------------------------
+Mon Feb 25 03:24:33 UTC 2019 - John Vandenberg
+
+- Add %license
+- Run test suite on both Python 2 & 3
+- Remove outdated build dependencies
+- Add minimum versions
+- Add python-coverage as build dependency as nose segfaults when missing
+
-------------------------------------------------------------------
Tue Dec 4 12:52:42 UTC 2018 - Matej Cepl
diff --git a/python-pyquery.spec b/python-pyquery.spec
index 4836210..4f1528b 100644
--- a/python-pyquery.spec
+++ b/python-pyquery.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-pyquery
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,15 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-# NOTE: circular dependency between python-pyquery and python-WebTest
-# enable testing with a build conditional (off by default):
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
%bcond_with test
-Name: python-pyquery
+%endif
+Name: python-pyquery%{psuffix}
Version: 1.4.0
Release: 0
Summary: A jQuery-like library for python
@@ -28,20 +33,20 @@ License: BSD-3-Clause
Group: Development/Languages/Python
URL: http://pypi.python.org/pypi/pyquery
Source: https://files.pythonhosted.org/packages/source/p/pyquery/pyquery-%{version}.tar.gz
-BuildRequires: %{python_module cssselect}
+BuildRequires: %{python_module coverage}
+BuildRequires: %{python_module cssselect > 0.7.9}
BuildRequires: %{python_module lxml >= 2.1}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
-Requires: python-cssselect
+Requires: python-cssselect > 0.7.9
Requires: python-lxml >= 2.1
BuildArch: noarch
%if %{with test}
-BuildRequires: %{python_module WebOb}
+BuildRequires: %{python_module WebOb > 1.1.9}
BuildRequires: %{python_module WebTest}
-BuildRequires: %{python_module beautifulsoup}
BuildRequires: %{python_module nose}
-BuildRequires: %{python_module restkit}
+BuildRequires: %{python_module requests}
%endif
%python_subpackages
@@ -57,16 +62,22 @@ XML and HTML manipulation.
%python_build
%install
+%if !%{with test}
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
%if %{with test}
%check
-nosetests -q tests
+# Disable tests which perform live fetch
+%python_exec -m nose tests -e test_get
%endif
+%if !%{with test}
%files %{python_files}
+%license LICENSE.txt
%doc CHANGES.rst README.rst
%{python_sitelib}/*
+%endif
%changelog