From 501b075884d877f2281a5c8178771940ee377f6b418c482a0a40b92b415e311c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 21 Nov 2018 18:08:02 +0000 Subject: [PATCH] Fix build OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=45 --- _multibuild | 3 +++ pyparsing-2.3.1~test4.tar.gz | 3 --- pyparsing-2.3.1~test5.tar.gz | 3 +++ python-pyparsing.spec | 19 +++++++++++++------ 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 _multibuild delete mode 100644 pyparsing-2.3.1~test4.tar.gz create mode 100644 pyparsing-2.3.1~test5.tar.gz 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/pyparsing-2.3.1~test4.tar.gz b/pyparsing-2.3.1~test4.tar.gz deleted file mode 100644 index 9b3edcc..0000000 --- a/pyparsing-2.3.1~test4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:606afcd112b68f0cda34441ef8ae35e8579ea3b12a8327e4b95b902fd9858dfc -size 296285 diff --git a/pyparsing-2.3.1~test5.tar.gz b/pyparsing-2.3.1~test5.tar.gz new file mode 100644 index 0000000..3998389 --- /dev/null +++ b/pyparsing-2.3.1~test5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f671df9146dbf152a8475cd1703d89909d8e70ad7c33eb706c0dfd7f498e668 +size 590351 diff --git a/python-pyparsing.spec b/python-pyparsing.spec index 9aba5b7..ea06f1d 100644 --- a/python-pyparsing.spec +++ b/python-pyparsing.spec @@ -19,9 +19,18 @@ %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 -Version: 2.3.1~test4 +%endif +Version: 2.3.1~test5 Release: 0 Summary: Grammar Parser Library for Python License: MIT AND GPL-2.0-or-later AND GPL-3.0-or-later @@ -34,7 +43,6 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python2-unittest2 BuildRequires: python3-Sphinx -BuildRequires: python3-Sphinx %if %{with test} BuildRequires: %{python_module nose} %endif @@ -66,9 +74,8 @@ HTML Documentation and examples for %name. %build %python_build -(cd docs/ -make html -) +# export PYTHONPATH=..:../examples +python3 setup.py build_sphinx -v %install %if ! %{with test} @@ -97,7 +104,7 @@ export PYTHONPATH=.:example %files -n %{name}-docs %if ! %{with test} -%doc examples docs/_build/html/ +%doc examples build/sphinx/html %endif %changelog