From 82dfab3ada3ddad2e301f556fc13295403757a32d15d1909e2b19ec14e1b8e76 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Wed, 25 Oct 2023 11:52:11 +0000
Subject: [PATCH] Accepting request 1119619 from home:NMorey:branches:science

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

OBS-URL: https://build.opensuse.org/request/show/1119619
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/fftw3?expand=0&rev=97
---
 _multibuild   |   3 -
 fftw3.changes |   6 ++
 fftw3.spec    | 162 ++++++++++++++++----------------------------------
 3 files changed, 57 insertions(+), 114 deletions(-)

diff --git a/_multibuild b/_multibuild
index 2c4ac14..89a8fe3 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,9 +1,6 @@
 <multibuild>
   <package>standard</package>
   <package>gnu-hpc</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/fftw3.changes b/fftw3.changes
index dc4ee56..f453132 100644
--- a/fftw3.changes
+++ b/fftw3.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 23 11:43:32 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Drop support for obsolete openmpi[123]
+- Prepare support for openmpi5
+
 -------------------------------------------------------------------
 Wed Apr 27 08:41:39 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/fftw3.spec b/fftw3.spec
index 11c14ea..3cebe65 100644
--- a/fftw3.spec
+++ b/fftw3.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -63,36 +63,6 @@ ExclusiveArch:  do_not_build
 %bcond_without hpc
 %endif
 
-%if "%{flavor}" == "gnu-openmpi-hpc"
-%{?DisOMPI1}
-%global compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor openmpi
-%define mpi_vers 1
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
-%if "%{flavor}" == "gnu-openmpi2-hpc"
-%{?DisOMPI2}
-%global compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor openmpi
-%define mpi_vers 2
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
-%if "%{flavor}" == "gnu-openmpi3-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
 %if "%{flavor}" == "gnu-openmpi4-hpc"
 %{?DisOMPI4}
 %global compiler_family gnu
@@ -103,6 +73,16 @@ ExclusiveArch:  do_not_build
 %bcond_without mpi
 %endif
 
+%if "%{flavor}" == "gnu-openmpi5-hpc"
+%{?DisOMPI5}
+%global compiler_family gnu
+%undefine c_f_ver
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
 %if "%{flavor}" == "gnu-mvapich2-hpc"
 %global compiler_family gnu
 %undefine c_f_ver
@@ -126,26 +106,6 @@ ExclusiveArch:  do_not_build
 %bcond_without hpc
 %endif
 
-%if "%{flavor}" == "gnu7-openmpi-hpc"
-%{?DisOMPI1}
-%global compiler_family gnu
-%define c_f_ver 7
-%global mpi_flavor openmpi
-%define mpi_vers 1
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
-%if "%{flavor}" == "gnu7-openmpi3-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%define c_f_ver 7
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
 %if "%{flavor}" == "gnu7-openmpi4-hpc"
 %{?DisOMPI4}
 %global compiler_family gnu
@@ -156,6 +116,16 @@ ExclusiveArch:  do_not_build
 %bcond_without mpi
 %endif
 
+%if "%{flavor}" == "gnu7-openmpi5-hpc"
+%{?DisOMPI5}
+%global compiler_family gnu
+%define c_f_ver 7
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
 %if "%{flavor}" == "gnu7-mvapich2-hpc"
 %global compiler_family gnu
 %define c_f_ver 7
@@ -179,26 +149,6 @@ ExclusiveArch:  do_not_build
 %bcond_without hpc
 %endif
 
-%if "%{flavor}" == "gnu8-openmpi-hpc"
-%{?DisOMPI1}
-%global compiler_family gnu
-%define c_f_ver 8
-%global mpi_flavor openmpi
-%define mpi_vers 1
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
-%if "%{flavor}" == "gnu8-openmpi3-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%define c_f_ver 8
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
 %if "%{flavor}" == "gnu8-openmpi4-hpc"
 %{?DisOMPI4}
 %global compiler_family gnu
@@ -209,6 +159,16 @@ ExclusiveArch:  do_not_build
 %bcond_without mpi
 %endif
 
+%if "%{flavor}" == "gnu8-openmpi5-hpc"
+%{?DisOMPI5}
+%global compiler_family gnu
+%define c_f_ver 8
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
 %if "%{flavor}" == "gnu8-mvapich2-hpc"
 %global compiler_family gnu
 %define c_f_ver 8
@@ -232,26 +192,6 @@ ExclusiveArch:  do_not_build
 %bcond_without hpc
 %endif
 
-%if "%{flavor}" == "gnu9-openmpi-hpc"
-%{?DisOMPI1}
-%global compiler_family gnu
-%define c_f_ver 9
-%global mpi_flavor openmpi
-%define mpi_vers 1
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
-%if "%{flavor}" == "gnu9-openmpi3-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%define c_f_ver 9
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
 %if "%{flavor}" == "gnu9-openmpi4-hpc"
 %{?DisOMPI4}
 %global compiler_family gnu
@@ -262,6 +202,16 @@ ExclusiveArch:  do_not_build
 %bcond_without mpi
 %endif
 
+%if "%{flavor}" == "gnu9-openmpi5-hpc"
+%{?DisOMPI5}
+%global compiler_family gnu
+%define c_f_ver 9
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
 %if "%{flavor}" == "gnu9-mvapich2-hpc"
 %global compiler_family gnu
 %define c_f_ver 9
@@ -285,26 +235,6 @@ ExclusiveArch:  do_not_build
 %bcond_without hpc
 %endif
 
-%if "%{flavor}" == "gnu10-openmpi-hpc"
-%{?DisOMPI1}
-%global compiler_family gnu
-%define c_f_ver 10
-%global mpi_flavor openmpi
-%define mpi_vers 1
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
-%if "%{flavor}" == "gnu10-openmpi3-hpc"
-%{?DisOMPI3}
-%global compiler_family gnu
-%define c_f_ver 10
-%global mpi_flavor openmpi
-%define mpi_vers 3
-%bcond_without hpc
-%bcond_without mpi
-%endif
-
 %if "%{flavor}" == "gnu10-openmpi4-hpc"
 %{?DisOMPI4}
 %global compiler_family gnu
@@ -315,6 +245,16 @@ ExclusiveArch:  do_not_build
 %bcond_without mpi
 %endif
 
+%if "%{flavor}" == "gnu10-openmpi5-hpc"
+%{?DisOMPI5}
+%global compiler_family gnu
+%define c_f_ver 10
+%global mpi_flavor openmpi
+%define mpi_vers 5
+%bcond_without hpc
+%bcond_without mpi
+%endif
+
 %if "%{flavor}" == "gnu10-mvapich2-hpc"
 %global compiler_family gnu
 %define c_f_ver 10