diff --git a/.files b/.files
index a062e2a..36f21fa 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index b200e2e..9e8e8d6 100644
--- a/.rev
+++ b/.rev
@@ -70,4 +70,12 @@
proper ABI versioning.
876983
+
+ 7c2b9b3a0c6b939985ffb36579d0f84c
+ 1.13.1
+
+ anag+factory
+
+ 1122565
+
diff --git a/_multibuild b/_multibuild
index 2ef916a..aec7aad 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,11 +1,5 @@
- openmpi
- openmpi2
- openmpi3
openmpi4
- gnu-openmpi-hpc
- gnu-openmpi2-hpc
- gnu-openmpi3-hpc
gnu-openmpi4-hpc
gnu-mpich-hpc
gnu-mvapich2-hpc
diff --git a/adios.changes b/adios.changes
index bbf8573..b64d3a3 100644
--- a/adios.changes
+++ b/adios.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Oct 23 11:36:32 UTC 2023 - Nicolas Morey
+
+- Drop support for obsolete openmpi[123]
+- Prepare support for openmpi5
+
+-------------------------------------------------------------------
Fri Feb 5 20:38:28 UTC 2021 - Egbert Eich
- Add build support for gcc10 to HPC build (bsc#1174439).
diff --git a/adios.spec b/adios.spec
index e77fafc..63ded1f 100644
--- a/adios.spec
+++ b/adios.spec
@@ -1,7 +1,7 @@
#
-# spec file for package adios
+# spec file
#
-# Copyright (c) 2021 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
@@ -41,27 +41,6 @@ ExcludeArch: s390 s390x
%define DisOMPI4 ExclusiveArch: do_not_build
%endif
-# this is a non-HPC build
-%if "%{flavor}" == "openmpi"
-%{?DisOMPI1}
-%global mpi_flavor openmpi
-%define mpi_ver 1
-%bcond_with hpc
-%endif
-
-%if "%{flavor}" == "openmpi2"
-%global mpi_flavor openmpi
-%define mpi_ver 2
-%bcond_with hpc
-%endif
-
-%if "%{flavor}" == "openmpi3"
-%{?DisOMPI3}
-%global mpi_flavor openmpi
-%define mpi_ver 3
-%bcond_with hpc
-%endif
-
%if "%{flavor}" == "openmpi4"
%{?DisOMPI4}
%global mpi_flavor openmpi
@@ -69,40 +48,29 @@ ExcludeArch: s390 s390x
%bcond_with hpc
%endif
-# All the HPC builds are below
-%if "%{flavor}" == "gnu-openmpi-hpc"
-%{?DisOMPI1}
-%bcond_without hpc
-%define compiler_family gnu
-%undefine c_f_ver
-%global mpi_flavor openmpi
-%define mpi_ver 1
-%endif
-
-%if "%{flavor}" == "gnu-openmpi2-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%undefine c_f_ver
+%if "%{flavor}" == "openmpi5"
+%{?DisOMPI5}
%global mpi_flavor openmpi
-%define mpi_ver 2
+%define mpi_ver 5
+%bcond_with hpc
%endif
-%if "%{flavor}" == "gnu-openmpi3-hpc"
-%{?DisOMPI3}
+%if "%{flavor}" == "gnu-openmpi4-hpc"
+%{?DisOMPI4}
%bcond_without hpc
%define compiler_family gnu
%undefine c_f_ver
%global mpi_flavor openmpi
-%define mpi_ver 3
+%define mpi_ver 4
%endif
-%if "%{flavor}" == "gnu-openmpi4-hpc"
-%{?DisOMPI4}
+%if "%{flavor}" == "gnu-openmpi5-hpc"
+%{?DisOMPI5}
%bcond_without hpc
%define compiler_family gnu
%undefine c_f_ver
%global mpi_flavor openmpi
-%define mpi_ver 4
+%define mpi_ver 5
%endif
%if "%{flavor}" == "gnu-mvapich2-hpc"
@@ -120,39 +88,23 @@ ExcludeArch: s390 s390x
%endif
# All the HPC builds are below
-%if "%{flavor}" == "gnu7-openmpi-hpc"
-%{?DisOMPI1}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 7
-%global mpi_flavor openmpi
-%define mpi_ver 1
-%endif
-%if "%{flavor}" == "gnu7-openmpi2-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 7
-%global mpi_flavor openmpi
-%define mpi_ver 2
-%endif
-
-%if "%{flavor}" == "gnu7-openmpi3-hpc"
-%{?DisOMPI3}
+%if "%{flavor}" == "gnu7-openmpi4-hpc"
+%{?DisOMPI4}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 7
%global mpi_flavor openmpi
-%define mpi_ver 3
+%define mpi_ver 4
%endif
-%if "%{flavor}" == "gnu7-openmpi4-hpc"
-%{?DisOMPI4}
+%if "%{flavor}" == "gnu7-openmpi5-hpc"
+%{?DisOMPI5}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 7
%global mpi_flavor openmpi
-%define mpi_ver 4
+%define mpi_ver 5
%endif
%if "%{flavor}" == "gnu7-mvapich2-hpc"
@@ -169,39 +121,22 @@ ExcludeArch: s390 s390x
%global mpi_flavor mpich
%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_ver 1
-%endif
-
-%if "%{flavor}" == "gnu8-openmpi2-hpc"
+%if "%{flavor}" == "gnu8-openmpi4-hpc"
+%{?DisOMPI4}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 8
%global mpi_flavor openmpi
-%define mpi_ver 2
+%define mpi_ver 4
%endif
-%if "%{flavor}" == "gnu8-openmpi3-hpc"
-%{?DisOMPI3}
+%if "%{flavor}" == "gnu8-openmpi5-hpc"
+%{?DisOMPI5}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 8
%global mpi_flavor openmpi
-%define mpi_ver 3
-%endif
-
-%if "%{flavor}" == "gnu8-openmpi4-hpc"
-%{?DisOMPI4}
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 8
-%global mpi_flavor openmpi
-%define mpi_ver 4
+%define mpi_ver 5
%endif
%if "%{flavor}" == "gnu8-mvapich2-hpc"
@@ -218,39 +153,22 @@ ExcludeArch: s390 s390x
%global mpi_flavor mpich
%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_ver 1
-%endif
-
-%if "%{flavor}" == "gnu9-openmpi2-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 9
-%global mpi_flavor openmpi
-%define mpi_ver 2
-%endif
-
-%if "%{flavor}" == "gnu9-openmpi3-hpc"
-%{?DisOMPI3}
+%if "%{flavor}" == "gnu9-openmpi4-hpc"
+%{?DisOMPI4}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 9
%global mpi_flavor openmpi
-%define mpi_ver 3
+%define mpi_ver 4
%endif
-%if "%{flavor}" == "gnu9-openmpi4-hpc"
-%{?DisOMPI4}
+%if "%{flavor}" == "gnu9-openmpi5-hpc"
+%{?DisOMPI5}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 9
%global mpi_flavor openmpi
-%define mpi_ver 4
+%define mpi_ver 5
%endif
%if "%{flavor}" == "gnu9-mvapich2-hpc"
@@ -267,39 +185,23 @@ ExcludeArch: s390 s390x
%global mpi_flavor mpich
%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_ver 1
-%endif
-%if "%{flavor}" == "gnu10-openmpi2-hpc"
-%bcond_without hpc
-%define compiler_family gnu
-%define c_f_ver 10
-%global mpi_flavor openmpi
-%define mpi_ver 2
-%endif
-
-%if "%{flavor}" == "gnu10-openmpi3-hpc"
-%{?DisOMPI3}
+%if "%{flavor}" == "gnu10-openmpi4-hpc"
+%{?DisOMPI4}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 10
%global mpi_flavor openmpi
-%define mpi_ver 3
+%define mpi_ver 4
%endif
-%if "%{flavor}" == "gnu10-openmpi4-hpc"
-%{?DisOMPI4}
+%if "%{flavor}" == "gnu10-openmpi5-hpc"
+%{?DisOMPI5}
%bcond_without hpc
%define compiler_family gnu
%define c_f_ver 10
%global mpi_flavor openmpi
-%define mpi_ver 4
+%define mpi_ver 5
%endif
%if "%{flavor}" == "gnu10-mvapich2-hpc"
@@ -362,7 +264,7 @@ Name: %{package_name}
Version: %{vers}
Release: 0
Summary: The Adaptable IO System (ADIOS)
-License: BSD-3-Clause AND LGPL-2.1-or-later AND BSD-2-Clause
+License: BSD-2-Clause AND BSD-3-Clause AND LGPL-2.1-or-later
Group: Productivity/Scientific/Other
URL: https://www.olcf.ornl.gov/center-projects/adios/
Source0: https://users.nccs.gov/~pnorbert/adios-%{version}.tar.gz
@@ -580,7 +482,7 @@ EOF
%{pkg_libdir}/*.a
%if %{with hpc}
-%postun
+%postun
%hpc_module_delete_if_default
%endif