From d658fc3a46875f65002ab4401b62e9fd93b6b4e7313e6d6f07b2c845f50c11a4 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 29 Nov 2019 17:31:34 +0000 Subject: [PATCH] Accepting request 752428 from home:eeich:branches:science - Disable openmpi1 builds for SLE/Leap > 15.1. - Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). OBS-URL: https://build.opensuse.org/request/show/752428 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=120 --- hdf5.changes | 6 ++++++ hdf5.spec | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hdf5.changes b/hdf5.changes index 67237b2..f5130d9 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 28 15:54:19 UTC 2019 - Egbert Eich + +- Disable openmpi1 builds for SLE/Leap > 15.1. +- Enable openmpi3 builds for Leap and SLE > 15.1 (jsc#SLE-7773). + ------------------------------------------------------------------- Thu Oct 24 06:37:26 UTC 2019 - Nicolas Morey-Chaisemartin diff --git a/hdf5.spec b/hdf5.spec index 141430b..1d53f9f 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -18,13 +18,10 @@ %global flavor @BUILD_FLAVOR@%{nil} -%if 0%{?is_opensuse} || 0%{?is_backports} -%undefine DisOMPI1 -%undefine DisOMPI2 -%undefine DisOMPI3 -%else +%if 0%{?sle_version} >= 150200 %define DisOMPI1 ExclusiveArch: do_not_build -%undefine DisOMPI2 +%endif +%if 0%{!?is_opensuse:1} && 0%{?sle_version:1} && 0%{?sle_version} < 150200 %define DisOMPI3 ExclusiveArch: do_not_build %endif