From 1580bf041c36acd660bda635c278eefa913a3d8744ad9883f1f089b27a8d7d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 28 Dec 2018 09:04:51 +0000 Subject: [PATCH 1/2] Accepting request 661733 from home:pluskalm:branches:devel:languages:python - Update build dependendcies to resolve building on SLE-12 OBS-URL: https://build.opensuse.org/request/show/661733 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=49 --- python-pyparsing.changes | 5 +++++ python-pyparsing.spec | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) 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} From 02825dedbbeb80bec08d2943e78974b87005c3f585780e075aa24cc8681a8c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 28 Dec 2018 10:00:36 +0000 Subject: [PATCH 2/2] Accepting request 661744 from devel:languages:python:avocado - Drop doc subpackage as it leads to circular dependencies on some releases OBS-URL: https://build.opensuse.org/request/show/661744 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=50 --- python-pyparsing.changes | 5 +++-- python-pyparsing.spec | 31 +++++++------------------------ 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/python-pyparsing.changes b/python-pyparsing.changes index c791d2b..6efa560 100644 --- a/python-pyparsing.changes +++ b/python-pyparsing.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Fri Dec 28 09:01:49 UTC 2018 - Martin Pluskal +Fri Dec 28 09:57:56 UTC 2018 - Martin Pluskal -- Update build dependendcies to resolve building on SLE-12 +- 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 50cfd7b..eb4853d 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -24,6 +24,11 @@ %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 @@ -33,24 +38,16 @@ URL: https://github.com/pyparsing/pyparsing/ # Upstream tarball from the master branch with gh#pyparsing/pyparsing#47 Source: 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: %{python_module packaging} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python2-unittest2 -BuildRequires: python3-Sphinx # 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} @@ -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