diff --git a/hdf5.changes b/hdf5.changes index eb60428..81eaad7 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 12 15:38:59 UTC 2018 - eich@suse.com + +- Disable the openmpi3 flavor in some products. + ------------------------------------------------------------------- Fri Jan 5 18:34:20 UTC 2018 - eich@suse.com diff --git a/hdf5.spec b/hdf5.spec index c89cd14..c89caae 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -18,6 +18,12 @@ %global flavor @BUILD_FLAVOR@%{nil} +%if 0%{?is_opensuse} || 0%{?is_backports} +%undefine DisOMPI3 +%else +%define DisOMPI3 ExclusiveArch: do_not_build +%endif + # %define _do_check 1 %define use_sz2 0 @@ -58,6 +64,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu-openmpi-hpc" +%{?DisOMPI1} %bcond_without hpc %define compiler_family gnu %undefine c_f_ver @@ -73,6 +80,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu-openmpi3-hpc" +%{?DisOMPI3} %bcond_without hpc %define compiler_family gnu %undefine c_f_ver @@ -95,6 +103,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu7-openmpi-hpc" +%{?DisOMPI1} %bcond_without hpc %define compiler_family gnu %define c_f_ver 7 @@ -110,6 +119,7 @@ ExclusiveArch: do_not_build %endif %if "%{flavor}" == "gnu7-openmpi3-hpc" +%{?DisOMPI3} %bcond_without hpc %define compiler_family gnu %define c_f_ver 7