Accepting request 923599 from home:bnavigator:branches:devel:languages:python:numeric
- The update- and libalternatives logic is required in the standard build, not the hpc flavor OBS-URL: https://build.opensuse.org/request/show/923599 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-numpy?expand=0&rev=97
This commit is contained in:
parent
c96fc808a3
commit
4b609746f3
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package python-numpy
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
@ -117,19 +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
|
||||
%if %{with libalternatives}
|
||||
Requires: alts
|
||||
BuildRequires: alts
|
||||
%else
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun):update-alternatives
|
||||
%endif
|
||||
%endif
|
||||
%python_subpackages
|
||||
|
||||
@ -291,11 +291,11 @@ rm -Rf %{buildroot}%{$python_sitearch}/numpy/.pytest_cache
|
||||
popd
|
||||
%endif
|
||||
|
||||
%if %{without hpc}
|
||||
%pre
|
||||
# If libalternatives is used: Removing old update-alternatives entries.
|
||||
%python_libalternatives_reset_alternative f2py
|
||||
|
||||
%if %{without hpc}
|
||||
%post
|
||||
%python_install_alternative f2py
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user