From aaf0415d02b87d54829f16bb54c656b78c814b6818e6a9c0ab626b6f341cc774 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 6 Oct 2021 00:24:58 +0000 Subject: [PATCH] Accepting request 923254 from home:schubi2 - Use libalternatives instead of update-alternatives. OBS-URL: https://build.opensuse.org/request/show/923254 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=96 --- python-numpy.changes | 5 +++++ python-numpy.spec | 20 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/python-numpy.changes b/python-numpy.changes index 2734f8a..9132f16 100644 --- a/python-numpy.changes +++ b/python-numpy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 30 10:05:18 UTC 2021 - Stefan Schubert + +- Use libalternatives instead of update-alternatives. + ------------------------------------------------------------------- Mon Sep 20 16:51:56 UTC 2021 - Ben Greiner diff --git a/python-numpy.spec b/python-numpy.spec index 566de86..f545a0b 100644 --- a/python-numpy.spec +++ b/python-numpy.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package python-numpy # # Copyright (c) 2021 SUSE LLC # @@ -16,6 +16,13 @@ # +# +%if 0%{?suse_version} > 1500 +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif + %global flavor @BUILD_FLAVOR@%{nil} %define ver 1.21.2 %define _ver 1_21_2 @@ -86,7 +93,7 @@ BuildRequires: %{python_module pytest >= 6.2.4} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module testsuite} -BuildRequires: python-rpm-macros +BuildRequires: python-rpm-macros >= 20210929 BuildRequires: unzip %if 0%{?suse_version} BuildRequires: fdupes @@ -116,9 +123,14 @@ BuildRequires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel BuildRequires: lua-lmod BuildRequires: suse-hpc Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc +%if %{with libalternatives} +Requires: alts +BuildRequires: alts +%else Requires(post): update-alternatives Requires(postun):update-alternatives %endif +%endif %python_subpackages %description @@ -279,6 +291,10 @@ rm -Rf %{buildroot}%{$python_sitearch}/numpy/.pytest_cache popd %endif +%pre +# If libalternatives is used: Removing old update-alternatives entries. +%python_libalternatives_reset_alternative f2py + %if %{without hpc} %post %python_install_alternative f2py