Accepting request 892242 from devel:languages:python:numeric

OBS-URL: https://build.opensuse.org/request/show/892242
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python3-espressomd?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2021-05-11 21:04:33 +00:00 committed by Git OBS Bridge
commit 9423144e7a
2 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 11 09:29:24 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Use openmpi4 on 'non-sle based systems' (aka Tumbleweed) (can't
use unversioned openmpi, as hdf5-openmpi-devel would not exist).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 29 15:42:42 UTC 2020 - Christoph Junghans <junghans@votca.org> Thu Oct 29 15:42:42 UTC 2020 - Christoph Junghans <junghans@votca.org>

View File

@ -1,7 +1,7 @@
# #
# spec file for package python3-espressomd # spec file for package python3-espressomd
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# Copyright (c) 2014 Christoph Junghans # Copyright (c) 2014 Christoph Junghans
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -19,7 +19,7 @@
# Build with OpenMPI # Build with OpenMPI
%if 0%{?sle_version} == 0 %if 0%{?sle_version} == 0
%define mpiver openmpi2 %define mpiver openmpi4
%else %else
%if 0%{?sle_version} <= 120300 %if 0%{?sle_version} <= 120300
%define mpiver openmpi %define mpiver openmpi
@ -55,19 +55,19 @@ BuildRequires: python3-Cython
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-numpy-devel BuildRequires: python3-numpy-devel
%if 0%{?suse_version} > 1325 %if 0%{?suse_version} > 1325
BuildRequires: hdf5-%{mpiver}-devel
BuildRequires: libboost_filesystem-devel BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_mpi-devel BuildRequires: libboost_mpi-devel
BuildRequires: libboost_system-devel BuildRequires: libboost_system-devel
BuildRequires: libboost_test-devel BuildRequires: libboost_test-devel
BuildRequires: hdf5-%{mpiver}-devel
BuildRequires: zlib-devel
BuildRequires: python3-h5py BuildRequires: python3-h5py
BuildRequires: zlib-devel
%else %else
BuildRequires: boost-devel BuildRequires: boost-devel
%endif %endif
Obsoletes: libEspresso4 < 4.1 Obsoletes: libEspresso4 < 4.1
Requires: python3-numpy
Requires: python3-h5py Requires: python3-h5py
Requires: python3-numpy
# make sure rpm pulls in the right dependency # make sure rpm pulls in the right dependency
Requires: libhdf5-%{mpiver} Requires: libhdf5-%{mpiver}