Accepting request 924802 from devel:languages:python:numeric

OBS-URL: https://build.opensuse.org/request/show/924802
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-numpy?expand=0&rev=104
This commit is contained in:
Dominique Leuenberger 2021-10-25 13:16:58 +00:00 committed by Git OBS Bridge
commit 7cd8024d3a
2 changed files with 30 additions and 3 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Oct 6 19:16:45 UTC 2021 - Ben Greiner <code@bnavigator.de>
- The update- and libalternatives logic is required in the standard
build, not the hpc flavor
-------------------------------------------------------------------
Thu Sep 30 10:05:18 UTC 2021 - Stefan Schubert <schubi@suse.de>
- Use libalternatives instead of update-alternatives.
-------------------------------------------------------------------
Mon Sep 20 16:51:56 UTC 2021 - Ben Greiner <code@bnavigator.de>

View File

@ -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
@ -110,14 +117,19 @@ Recommends: libopenblas_pthreads0
# Protect it from substitution
%define oldpy_numpy python-numpy
Conflicts: %{oldpy_numpy} <= 1.12.0
%if %{with libalternatives}
BuildRequires: alts
Requires: alts
%else
Requires(post): update-alternatives
Requires(postun):update-alternatives
%endif
%else
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
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
Requires(post): update-alternatives
Requires(postun):update-alternatives
%endif
%python_subpackages
@ -280,6 +292,10 @@ popd
%endif
%if %{without hpc}
%pre
# If libalternatives is used: Removing old update-alternatives entries.
%python_libalternatives_reset_alternative f2py
%post
%python_install_alternative f2py