From 66215223ece2bc0d8ef9eb1b377955d6850256f89ce6ba7b944edc76992540f6 Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Tue, 21 Jul 2020 07:18:54 +0000
Subject: [PATCH] Accepting request 821978 from home:eeich:branches:science

- Add missing openmpi4 flavors.
- Enable build of non-HPC flavors for all non-HPC builds.

OBS-URL: https://build.opensuse.org/request/show/821978
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=135
---
 hdf5.changes |  6 ++++++
 hdf5.spec    | 32 +++++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/hdf5.changes b/hdf5.changes
index 2552a3c..f9cfe7c 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 20 14:48:42 UTC 2020 - Egbert Eich <eich@suse.com>
+
+- Add missing openmpi4 flavors.
+- Enable build of non-HPC flavors for all non-HPC builds.
+
 -------------------------------------------------------------------
 Wed Jun 24 07:32:58 UTC 2020 - Alin M Elena <alinm.elena@gmail.com>
 
diff --git a/hdf5.spec b/hdf5.spec
index a7a8af9..ea1b977 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -180,6 +180,15 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 3
 %endif
 
+%if "%{flavor}" == "gnu7-openmpi4-hpc"
+%{?DisOMPI4}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 7
+%global mpi_flavor openmpi
+%define mpi_vers 4
+%endif
+
 %if "%{flavor}" == "gnu7-mpich-hpc"
 %bcond_without hpc
 %define compiler_family gnu
@@ -221,6 +230,15 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 3
 %endif
 
+%if "%{flavor}" == "gnu8-openmpi4-hpc"
+%{?DisOMPI4}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 8
+%global mpi_flavor openmpi
+%define mpi_vers 4
+%endif
+
 %if "%{flavor}" == "gnu8-mvapich2-hpc"
 %bcond_without hpc
 %define compiler_family gnu
@@ -269,6 +287,15 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 3
 %endif
 
+%if "%{flavor}" == "gnu9-openmpi4-hpc"
+%{?DisOMPI4}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 9
+%global mpi_flavor openmpi
+%define mpi_vers 4
+%endif
+
 %if "%{flavor}" == "gnu9-mvapich2-hpc"
 %bcond_without hpc
 %define compiler_family gnu
@@ -283,11 +310,6 @@ ExclusiveArch:  do_not_build
 %global mpi_flavor mpich
 %endif
 
-# Don't build non-HPC on SLE
-%if !0%{?is_opensuse} && !0%{?with_hpc:1}
-ExclusiveArch:  do_not_build
-%endif
-
 %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}
 %{?with_hpc:%{!?compiler_family:%global compiler_family gnu}}
 %{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}