From 5810b1f9da4c86a45ed1eda4c90c32877f9d4418b8d34add8dd214194b9fe82e Mon Sep 17 00:00:00 2001
From: Arvin Schnell <aschnell@suse.com>
Date: Tue, 24 Oct 2023 14:53:09 +0000
Subject: [PATCH] Accepting request 1119897 from home:NMorey:branches:science

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

OBS-URL: https://build.opensuse.org/request/show/1119897
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=317
---
 _multibuild   |  2 --
 boost.changes |  6 ++++
 boost.spec    | 82 ++++++++++++++++-----------------------------------
 3 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/_multibuild b/_multibuild
index 3256abe..781e94b 100644
--- a/_multibuild
+++ b/_multibuild
@@ -2,8 +2,6 @@
   <package>base</package>
   <package>extra</package>
   <package>gnu-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/boost.changes b/boost.changes
index 11f1116..849c8e5 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 24 08:09:17 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Drop support for obsolete openmpi[123]
+- Prepare support for openmpi5
+
 -------------------------------------------------------------------
 Tue Sep 05 07:39:53 CEST 2023 - aschnell@suse.com
 
diff --git a/boost.spec b/boost.spec
index fa00639..1fe334a 100644
--- a/boost.spec
+++ b/boost.spec
@@ -75,29 +75,6 @@ ExclusiveArch:  do_not_build
 %bcond_without hpc
 %endif
 
-%if "%{flavor}" == "gnu-openmpi2-hpc"
-%define build_base 0
-%define mpi_vers 2
-%define compiler_family gnu
-%define mpi_flavor openmpi
-%undefine c_f_ver
-%bcond_without hpc
-%bcond_without mpi
-%bcond_without python3
-%endif
-
-%if "%{flavor}" == "gnu-openmpi3-hpc"
-%{?DisOMPI3}
-%define build_base 0
-%define mpi_vers 3
-%define compiler_family gnu
-%define mpi_flavor openmpi
-%undefine c_f_ver
-%bcond_without hpc
-%bcond_without mpi
-%bcond_without python3
-%endif
-
 %if "%{flavor}" == "gnu-openmpi4-hpc"
 %{?DisOMPI4}
 %define build_base 0
@@ -110,6 +87,18 @@ ExclusiveArch:  do_not_build
 %bcond_without python3
 %endif
 
+%if "%{flavor}" == "gnu-openmpi5-hpc"
+%{?DisOMPI5}
+%define build_base 0
+%define mpi_vers 5
+%define compiler_family gnu
+%define mpi_flavor openmpi
+%undefine c_f_ver
+%bcond_without hpc
+%bcond_without mpi
+%bcond_without python3
+%endif
+
 %if "%{flavor}" == "gnu-mvapich2-hpc"
 %define build_base 0
 %define compiler_family gnu
@@ -120,39 +109,6 @@ ExclusiveArch:  do_not_build
 %bcond_without python3
 %endif
 
-%if "%{flavor}" == "gnu-mpich-hpc"
-%define build_base 0
-%define compiler_family gnu
-%define mpi_flavor mpich
-%undefine c_f_ver
-%bcond_without hpc
-%bcond_without mpi
-%bcond_without python3
-%endif
-#
-%if "%{flavor}" == "gnu10-openmpi2-hpc"
-%define build_base 0
-%define mpi_vers 2
-%define compiler_family gnu
-%define mpi_flavor openmpi
-%define c_f_ver 10
-%bcond_without hpc
-%bcond_without mpi
-%bcond_without python3
-%endif
-
-%if "%{flavor}" == "gnu10-openmpi3-hpc"
-%{?DisOMPI3}
-%define build_base 0
-%define mpi_vers 3
-%define compiler_family gnu
-%define mpi_flavor openmpi
-%define c_f_ver 10
-%bcond_without hpc
-%bcond_without mpi
-%bcond_without python3
-%endif
-
 %if "%{flavor}" == "gnu10-openmpi4-hpc"
 %{?DisOMPI4}
 %define build_base 0
@@ -165,6 +121,18 @@ ExclusiveArch:  do_not_build
 %bcond_without python3
 %endif
 
+%if "%{flavor}" == "gnu10-openmpi5-hpc"
+%{?DisOMPI5}
+%define build_base 0
+%define mpi_vers 5
+%define compiler_family gnu
+%define mpi_flavor openmpi
+%define c_f_ver 10
+%bcond_without hpc
+%bcond_without mpi
+%bcond_without python3
+%endif
+
 %if "%{flavor}" == "gnu10-mvapich2-hpc"
 %define build_base 0
 %define compiler_family gnu
@@ -268,7 +236,7 @@ Patch20:        python_library_name.patch
 Patch21:        boost-remove-cmakedir.patch
 Patch22:        boost-process.patch
 # https://github.com/boostorg/mpi/issues/149
-Patch50:	boost-mpi-noreturn.patch
+Patch50:        boost-mpi-noreturn.patch
 %{?suse_build_hwcaps_libs}
 BuildRequires:  fdupes
 BuildRequires:  gmp-devel