From c3a37573aa978a5823372ba0f679240b6a964aae1415ad7282eda1e36dd194ed Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Thu, 31 Oct 2019 14:22:04 +0000
Subject: [PATCH] Accepting request 742472 from science:HPC:mpi-cleanup

- openmpi has been renamed into openmpi1

OBS-URL: https://build.opensuse.org/request/show/742472
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=118
---
 _multibuild  | 2 +-
 hdf5.changes | 5 +++++
 hdf5.spec    | 4 +---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/_multibuild b/_multibuild
index 8aa0708..ca7908e 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,6 +1,6 @@
 <multibuild>
   <package>serial</package>
-  <package>openmpi</package>
+  <package>openmpi1</package>
   <package>openmpi2</package>
   <package>openmpi3</package>
   <package>mvapich2</package>
diff --git a/hdf5.changes b/hdf5.changes
index dad1339..67237b2 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 24 06:37:26 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+
+- openmpi has been renamed into openmpi1
+
 -------------------------------------------------------------------
 Tue Sep 10 07:54:05 UTC 2019 - Ana Guerrero Lopez <aguerrero@suse.com>
 
diff --git a/hdf5.spec b/hdf5.spec
index d93b9b7..141430b 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -51,7 +51,7 @@ ExclusiveArch:  do_not_build
 %bcond_with hpc
 %endif
 
-%if "%{flavor}" == "openmpi"
+%if "%{flavor}" == "openmpi1"
 %{?DisOMPI1}
 %global mpi_flavor openmpi
 %define mpi_vers 1
@@ -173,9 +173,7 @@ ExclusiveArch:  do_not_build
 %{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}
 
 # For compatibility package names
-%if "%{mpi_flavor}" != "openmpi" || "%{mpi_vers}" != "1"
 %define mpi_ext %{?mpi_vers}
-%endif
 
 %if %{with hpc}
 %{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}}