From 536577f770a5d57cf368f6c59af2d1bd7e83e2800c6d4ad6a042517b968f6d7e Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Sat, 28 Oct 2023 08:16:48 +0000
Subject: [PATCH] Accepting request 1119621 from home:NMorey:branches:science

- Drop support for obsolete openmpi[123]
- Prepare support for openmpi5

OBS-URL: https://build.opensuse.org/request/show/1119621
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=166
---
 _multibuild  |   6 --
 hdf5.changes |   6 ++
 hdf5.spec    | 248 ++++++++++++++-------------------------------------
 3 files changed, 72 insertions(+), 188 deletions(-)

diff --git a/_multibuild b/_multibuild
index 5a9261d..3b183b7 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,13 +1,7 @@
 <multibuild>
   <package>serial</package>
-  <package>openmpi1</package>
-  <package>openmpi2</package>
-  <package>openmpi3</package>
   <package>openmpi4</package>
   <package>mvapich2</package>
-  <package>gnu-openmpi-hpc</package>
-  <package>gnu-openmpi2-hpc</package>
-  <package>gnu-openmpi3-hpc</package>
   <package>gnu-openmpi4-hpc</package>
   <package>gnu-mvapich2-hpc</package>
   <package>gnu-mpich-hpc</package>
diff --git a/hdf5.changes b/hdf5.changes
index 353a555..9d08b80 100644
--- a/hdf5.changes
+++ b/hdf5.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 23 11:45:45 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Drop support for obsolete openmpi[123]
+- Prepare support for openmpi5
+
 -------------------------------------------------------------------
 Mon Feb 13 09:18:05 UTC 2023 - Egbert Eich <eich@suse.com>
 
diff --git a/hdf5.spec b/hdf5.spec
index c178e9b..bd27207 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -50,27 +50,6 @@ ExclusiveArch:  do_not_build
 %bcond_with hpc
 %endif
 
-%if "%{flavor}" == "openmpi1"
-%{?DisOMPI1}
-%global mpi_flavor openmpi
-%define mpi_vers 1
-%bcond_with hpc
-%endif
-
-%if "%{flavor}" == "openmpi2"
-%{?DisOMPI2}
-%global mpi_flavor openmpi
-%define mpi_vers 2
-%bcond_with hpc
-%endif
-
-%if "%{flavor}" == "openmpi3"
-%{?DisOMPI3}
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%bcond_with hpc
-%endif
-
 %if "%{flavor}" == "openmpi4"
 %{?DisOMPI4}
 %global mpi_flavor openmpi
@@ -78,6 +57,13 @@ ExclusiveArch:  do_not_build
 %bcond_with hpc
 %endif
 
+%if "%{flavor}" == "openmpi5"
+%{?DisOMPI5}
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%bcond_with hpc
+%endif
+
 %if "%{flavor}" == "mvapich2"
 %global mpi_flavor %{flavor}
 %bcond_with hpc
@@ -89,40 +75,6 @@ ExclusiveArch:  do_not_build
 %undefine c_f_ver
 %endif
 
-%if "%{flavor}" == "gnu-openmpi-hpc"
-%{?DisOMPI1}
-%bcond_without hpc
-%define compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor openmpi
-%define mpi_vers 1
-%endif
-
-%if "%{flavor}" == "gnu-mvapich2-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor mvapich2
-%endif
-
-%if "%{flavor}" == "gnu-openmpi2-hpc"
-%{?DisOMPI2}
-%bcond_without hpc
-%define compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor openmpi
-%define mpi_vers 2
-%endif
-
-%if "%{flavor}" == "gnu-openmpi3-hpc"
-%{?DisOMPI3}
-%bcond_without hpc
-%define compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%endif
-
 %if "%{flavor}" == "gnu-openmpi4-hpc"
 %{?DisOMPI4}
 %bcond_without hpc
@@ -132,6 +84,22 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 4
 %endif
 
+%if "%{flavor}" == "gnu-openmpi5-hpc"
+%{?DisOMPI5}
+%bcond_without hpc
+%define compiler_family gnu
+%undefine c_f_ver
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%endif
+
+%if "%{flavor}" == "gnu-mvapich2-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%undefine c_f_ver
+%global mpi_flavor mvapich2
+%endif
+
 %if "%{flavor}" == "gnu-mpich-hpc"
 %bcond_without hpc
 %define compiler_family gnu
@@ -146,40 +114,6 @@ ExclusiveArch:  do_not_build
 %undefine mpi_flavor
 %endif
 
-%if "%{flavor}" == "gnu7-openmpi-hpc"
-%{?DisOMPI1}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 7
-%global mpi_flavor openmpi
-%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
-%define c_f_ver 7
-%global mpi_flavor mvapich2
-%endif
-
-%if "%{flavor}" == "gnu7-openmpi3-hpc"
-%{?DisOMPI3}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 7
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%endif
-
 %if "%{flavor}" == "gnu7-openmpi4-hpc"
 %{?DisOMPI4}
 %bcond_without hpc
@@ -189,6 +123,22 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 4
 %endif
 
+%if "%{flavor}" == "gnu7-openmpi5-hpc"
+%{?DisOMPI5}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 7
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%endif
+
+%if "%{flavor}" == "gnu7-mvapich2-hpc"
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 7
+%global mpi_flavor mvapich2
+%endif
+
 %if "%{flavor}" == "gnu7-mpich-hpc"
 %bcond_without hpc
 %define compiler_family gnu
@@ -203,33 +153,6 @@ ExclusiveArch:  do_not_build
 %undefine mpi_flavor
 %endif
 
-%if "%{flavor}" == "gnu8-openmpi-hpc"
-%{?DisOMPI1}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 8
-%global mpi_flavor openmpi
-%define mpi_vers 1
-%endif
-
-%if "%{flavor}" == "gnu8-openmpi2-hpc"
-%{?DisOMPI2}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 8
-%global mpi_flavor openmpi
-%define mpi_vers 2
-%endif
-
-%if "%{flavor}" == "gnu8-openmpi3-hpc"
-%{?DisOMPI3}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 8
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%endif
-
 %if "%{flavor}" == "gnu8-openmpi4-hpc"
 %{?DisOMPI4}
 %bcond_without hpc
@@ -239,6 +162,15 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 4
 %endif
 
+%if "%{flavor}" == "gnu8-openmpi5-hpc"
+%{?DisOMPI5}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 8
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%endif
+
 %if "%{flavor}" == "gnu8-mvapich2-hpc"
 %bcond_without hpc
 %define compiler_family gnu
@@ -260,33 +192,6 @@ ExclusiveArch:  do_not_build
 %undefine mpi_flavor
 %endif
 
-%if "%{flavor}" == "gnu9-openmpi-hpc"
-%{?DisOMPI1}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 9
-%global mpi_flavor openmpi
-%define mpi_vers 1
-%endif
-
-%if "%{flavor}" == "gnu9-openmpi2-hpc"
-%{?DisOMPI2}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 9
-%global mpi_flavor openmpi
-%define mpi_vers 2
-%endif
-
-%if "%{flavor}" == "gnu9-openmpi3-hpc"
-%{?DisOMPI3}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 9
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%endif
-
 %if "%{flavor}" == "gnu9-openmpi4-hpc"
 %{?DisOMPI4}
 %bcond_without hpc
@@ -296,6 +201,15 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 4
 %endif
 
+%if "%{flavor}" == "gnu9-openmpi5-hpc"
+%{?DisOMPI5}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 9
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%endif
+
 %if "%{flavor}" == "gnu9-mvapich2-hpc"
 %bcond_without hpc
 %define compiler_family gnu
@@ -317,33 +231,6 @@ ExclusiveArch:  do_not_build
 %undefine mpi_flavor
 %endif
 
-%if "%{flavor}" == "gnu10-openmpi-hpc"
-%{?DisOMPI1}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 10
-%global mpi_flavor openmpi
-%define mpi_vers 1
-%endif
-
-%if "%{flavor}" == "gnu10-openmpi2-hpc"
-%{?DisOMPI2}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 10
-%global mpi_flavor openmpi
-%define mpi_vers 2
-%endif
-
-%if "%{flavor}" == "gnu10-openmpi3-hpc"
-%{?DisOMPI3}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 10
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%endif
-
 %if "%{flavor}" == "gnu10-openmpi4-hpc"
 %{?DisOMPI4}
 %bcond_without hpc
@@ -353,6 +240,15 @@ ExclusiveArch:  do_not_build
 %define mpi_vers 4
 %endif
 
+%if "%{flavor}" == "gnu10-openmpi5-hpc"
+%{?DisOMPI5}
+%bcond_without hpc
+%define compiler_family gnu
+%define c_f_ver 10
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%endif
+
 %if "%{flavor}" == "gnu10-mvapich2-hpc"
 %bcond_without hpc
 %define compiler_family gnu
@@ -372,11 +268,7 @@ ExclusiveArch:  do_not_build
 %{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}}
 
 # For compatibility package names
-%if "%{flavor}" == "openmpi1" && 0%{?suse_version} <= 1500
-%define mpi_ext %{nil}
-%else
 %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}}}
@@ -489,10 +381,6 @@ BuildRequires:  %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macr
  %endif
 %endif  # ?hpc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if "%{flavor}" == "openmpi1" && 0%{?suse_version} <= 1500
-Provides:       %{pname}-openmpi = %{version}-%{release}
-Obsoletes:      %{pname}-openmpi < %{version}-%{release}
-%endif
 
 %description
 HDF5 is a data model, library, and file format for storing and
@@ -629,10 +517,6 @@ Requires:       %{libname -l _fortran -s %{sonum_F}} = %{version}
 Requires:       %{libname -l _hl -s %{sonum_HL}} = %{version}
 Requires:       %{libname -l hl_fortran -s %{sonum_HL_F}} = %{version}
 %{?with_hpc:%hpc_requires_devel}
-%if "%{flavor}" == "openmpi1" && 0%{?suse_version} <= 1500
-Provides:       %{pname}-openmpi-devel = %{version}-%{release}
-Obsoletes:      %{pname}-openmpi-devel < %{version}-%{release}
-%endif
 
 %description devel
 HDF5 is a data model, library, and file format for storing and