diff --git a/python-actdiag.changes b/python-actdiag.changes index f58240b..6e5930b 100644 --- a/python-actdiag.changes +++ b/python-actdiag.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 4 20:14:27 UTC 2022 - Ben Greiner + +- Fix the requirements +- Enable tests +- Don't catchall files + ------------------------------------------------------------------- Thu Aug 4 08:24:17 UTC 2022 - Otto Hollmann diff --git a/python-actdiag.spec b/python-actdiag.spec index 761addd..cb12cf4 100644 --- a/python-actdiag.spec +++ b/python-actdiag.spec @@ -16,8 +16,6 @@ # -%define skip_python2 1 -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-actdiag Version: 3.0.0 Release: 0 @@ -26,20 +24,18 @@ License: Apache-2.0 Group: Development/Languages/Python URL: http://blockdiag.com/ Source: https://files.pythonhosted.org/packages/source/a/actdiag/actdiag-%{version}.tar.gz +BuildRequires: %{python_module base >= 3.7} +BuildRequires: %{python_module blockdiag >= 3} +BuildRequires: %{python_module docutils} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-blockdiag >= 1.5.0 +Requires: python-blockdiag >= 3 Requires: python-setuptools Requires(post): update-alternatives Requires(postun):update-alternatives BuildArch: noarch -%if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24 || 0%{?rhel} >= 8 -Suggests: python-docutils -Suggests: python-nose -Suggests: python-pep8 >= 1.3 -Suggests: python-reportlab -%endif %python_subpackages %description @@ -47,6 +43,8 @@ actdiag generates activity-diagram image files from spec-text files. %prep %setup -q -n actdiag-%{version} +# python-blockdiag-nose-to-pytest.patch of python-blockdiag changed the function name +sed -i 's/testcase_generator/_testcase_generator/' src/actdiag/tests/test_generate_diagram.py %build %python_build @@ -56,6 +54,9 @@ actdiag generates activity-diagram image files from spec-text files. %python_clone -a %{buildroot}%{_bindir}/actdiag %python_expand %fdupes %{buildroot}%{$python_sitelib} +%check +%pytest src/actdiag/tests + %post %python_install_alternative actdiag @@ -66,6 +67,7 @@ actdiag generates activity-diagram image files from spec-text files. %license LICENSE %doc README.rst %python_alternative %{_bindir}/actdiag -%{python_sitelib}/* +%{python_sitelib}/actdiag +%{python_sitelib}/actdiag-%{version}*-info %changelog