diff --git a/python-pyparsing.changes b/python-pyparsing.changes index c2def46..6efa560 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 28 09:57:56 UTC 2018 - Martin Pluskal + +- Drop doc subpackage as it leads to circular dependencies on some + releases + ------------------------------------------------------------------- Thu Nov 22 17:53:10 UTC 2018 - Jan Engelhardt diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 03e376d..eb4853d 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -18,7 +18,6 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} - %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %bcond_without test @@ -38,19 +37,17 @@ 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} +BuildRequires: %{python_module nose} +# Source: https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%%{version}.tar.gz 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 + %ifpython2 Provides: %{oldpython}-parsing = %{version} Obsoletes: %{oldpython}-parsing < %{version} @@ -63,20 +60,11 @@ simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions. The pyparsing module provides a library of classes that client code uses to construct the grammar directly in Python code. -%package -n %{name}-docs -Summary: Documentation files for %name -Group: Documentation/HTML - -%description -n %{name}-docs -HTML Documentation and examples for %name. - %prep %setup -q -n pyparsing-2.3.1 %build %python_build -# export PYTHONPATH=..:../examples -python3 setup.py build_sphinx -v %install %if ! %{with test} @@ -103,9 +91,4 @@ export PYTHONPATH=.:example %{python_sitelib}/pyparsing-%{version}-py*.egg-info/ %endif -%files -n %{name}-docs -%if ! %{with test} -%doc examples build/sphinx/html -%endif - %changelog