From d33ab56833e93c174e04c58e4ad41e615f3875594d0143f06fa189b4404b4157 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Fri, 29 Nov 2019 18:37:15 +0000
Subject: [PATCH] - Add missing openmpi2 builds for gcc7/8/9

OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=122
---
 hdf5.spec | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/hdf5.spec b/hdf5.spec
index a729002..33aa4ec 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -137,6 +137,15 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 1
 %endif
 
+%if "%{flavor}" == "gnu7-openmpi2-hpc"
+%{?DisOMPI2}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 7
+%global mpi_flavor openmpi
+%define mpi_vers 2
+%endif
+
 %if "%{flavor}" == "gnu7-mvapich2-hpc"
 %bcond_without hpc
 %define compiler_family gnu
@@ -176,11 +185,13 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 1
 %endif
 
-%if "%{flavor}" == "gnu8-mvapich2-hpc"
+%if "%{flavor}" == "gnu8-openmpi2-hpc"
+%{?DisOMPI2}
 %bcond_without hpc
 %define compiler_family gnu
 %define c_f_ver 8
-%global mpi_flavor mvapich2
+%global mpi_flavor openmpi
+%define mpi_vers 2
 %endif
 
 %if "%{flavor}" == "gnu8-openmpi3-hpc"
@@ -192,6 +203,13 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 3
 %endif
 
+%if "%{flavor}" == "gnu8-mvapich2-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 8
+%global mpi_flavor mvapich2
+%endif
+
 %if "%{flavor}" == "gnu8-mpich-hpc"
 %bcond_without hpc
 %define compiler_family gnu
@@ -215,11 +233,13 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 1
 %endif
 
-%if "%{flavor}" == "gnu9-mvapich2-hpc"
+%if "%{flavor}" == "gnu9-openmpi2-hpc"
+%{?DisOMPI2}
 %bcond_without hpc
 %define compiler_family gnu
 %define c_f_ver 9
-%global mpi_flavor mvapich2
+%global mpi_flavor openmpi
+%define mpi_vers 2
 %endif
 
 %if "%{flavor}" == "gnu9-openmpi3-hpc"
@@ -231,6 +251,13 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 3
 %endif
 
+%if "%{flavor}" == "gnu9-mvapich2-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 9
+%global mpi_flavor mvapich2
+%endif
+
 %if "%{flavor}" == "gnu9-mpich-hpc"
 %bcond_without hpc
 %define compiler_family gnu