diff --git a/python-pyparsing.changes b/python-pyparsing.changes index c2def46..c791d2b 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 28 09:01:49 UTC 2018 - Martin Pluskal + +- Update build dependendcies to resolve building on SLE-12 + ------------------------------------------------------------------- Thu Nov 22 17:53:10 UTC 2018 - Jan Engelhardt diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 03e376d..50cfd7b 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -18,18 +18,12 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} - %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %bcond_without test %else %bcond_with test %endif -%if %{with test} -Name: python-pyparsing-%{flavor} -%else -Name: python-pyparsing -%endif Version: 2.3.1~test5 Release: 0 Summary: Grammar Parser Library for Python @@ -38,19 +32,25 @@ Group: Development/Languages/Python URL: https://github.com/pyparsing/pyparsing/ # Upstream tarball from the master branch with gh#pyparsing/pyparsing#47 Source: pyparsing-%{version}.tar.gz -# Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%%{version}.tar.gz BuildRequires: %{python_module base} +# Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%%{version}.tar.gz +BuildRequires: %{python_module packaging} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python2-unittest2 BuildRequires: python3-Sphinx -%if %{with test} -BuildRequires: %{python_module nose} -%endif # do not add dependencies on setuptools and ideally not even full "python"; # this is now a dependency of setuptools Requires: python-base BuildArch: noarch +%if %{with test} +Name: python-pyparsing-%{flavor} +%else +Name: python-pyparsing +%endif +%if %{with test} +BuildRequires: %{python_module nose} +%endif %ifpython2 Provides: %{oldpython}-parsing = %{version} Obsoletes: %{oldpython}-parsing < %{version}