From 32126732e54d4a67b3337fdd5e4a6c7d53ef4ba294b9486db424237ca52adfc8 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 10 Dec 2020 18:47:56 +0000 Subject: [PATCH 1/2] - Fix alternatives OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-coverage?expand=0&rev=85 --- python-coverage.changes | 5 +++++ python-coverage.spec | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/python-coverage.changes b/python-coverage.changes index 22c570c..b43f4d3 100644 --- a/python-coverage.changes +++ b/python-coverage.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 10 18:42:00 UTC 2020 - Matej Cepl + +- Fix alternatives + ------------------------------------------------------------------- Wed Dec 2 23:04:31 UTC 2020 - Benjamin Greiner diff --git a/python-coverage.spec b/python-coverage.spec index c70dc59..7adaddf 100644 --- a/python-coverage.spec +++ b/python-coverage.spec @@ -72,14 +72,9 @@ rm tests/test_plugins.py %install %python_install +rm -vf %{buildroot}%{_bindir}/coverage{2,3} %python_clone -a %{buildroot}%{_bindir}/coverage %python_expand %fdupes %{buildroot}%{$python_sitearch} -%if 0%{?have_python2} && ! 0%{?skip_python2} -ln -sf coverage-%{python2_version} %{buildroot}%{_bindir}/coverage2 -%endif -%if 0%{?have_python3} && ! 0%{?skip_python3} -ln -sf coverage-%{python3_version} %{buildroot}%{_bindir}/coverage3 -%endif %check # GetZipBytesTest.test_get_encoded_zip_files - needs zip command @@ -108,7 +103,6 @@ export PATH="$(pwd)/build/bin:$PATH" export PYTHONPATH=":x" %pytest_arch -k 'not (test_get_encoded_zip_files or test_egg or test_doctest or test_unicode or test_version or test_multiprocessing_with_branching or test_farm or test_dothtml_not_python or test_one_of or test_bytes or test_encoding or test_multi or test_xdist_sys_path_nuttiness_is_fixed or test_debug_sys_ctracer)' - %post %python_install_alternative coverage @@ -119,8 +113,6 @@ export PYTHONPATH=":x" %license LICENSE.txt %doc CHANGES.rst CONTRIBUTORS.txt README.rst howto.txt %python_alternative %{_bindir}/coverage -%python2_only %{_bindir}/coverage2 -%python3_only %{_bindir}/coverage3 %{python_sitearch}/coverage/ %{python_sitearch}/coverage-%{version}-py%{python_version}.egg-info From 30ed09655cfd34f820f895afe3aa94098b3d4526c4e8e18cae1b062ec030fd37 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 10 Dec 2020 19:00:34 +0000 Subject: [PATCH 2/2] Get rid of whole %python3_only thing OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-coverage?expand=0&rev=86 --- python-coverage.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/python-coverage.spec b/python-coverage.spec index 7adaddf..269d2de 100644 --- a/python-coverage.spec +++ b/python-coverage.spec @@ -17,13 +17,6 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -# We redefine this locally, because we are sure that it is only used for files, -# which only the primary python3 flavor should provide for python3 multiflavor -# gh#openSUSE/python-rpm-macros#66 -%define python3_only() %%if "%%{python_flavor}" == "python3" || "%%{python_provides}" == "python3" \ -%** \ -%%endif - Name: python-coverage Version: 5.3 Release: 0