From 0d7cd0891afac32a1b655a9f0d6e3f0322a2ecee Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 9 Jul 2023 23:54:43 -0400 Subject: [PATCH] Disable PSM2 in ELN builds libpsm2 is listed as unwanted in ELN and RHEL 10+. Also, clarify the PSM conditional as disabled in RHEL 8+. --- openmpi.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/openmpi.spec b/openmpi.spec index c574f67..e710ad8 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -39,12 +39,16 @@ %endif %ifarch x86_64 -%if %{defined rhel} +%if 0%{?rhel} >= 8 %bcond_with psm %else %bcond_without psm %endif +%if 0%{?rhel} >= 10 +%bcond_with psm2 +%else %bcond_without psm2 +%endif %else %bcond_with psm %bcond_with psm2 @@ -55,7 +59,7 @@ Name: openmpi%{?_cc_name_suffix} Version: 4.1.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Message Passing Interface License: BSD and MIT and Romio URL: http://www.open-mpi.org/ @@ -402,6 +406,9 @@ make check %changelog +* Mon Jul 10 2023 Yaakov Selkowitz - 4.1.5-4 +- Disable PSM2 in RHEL 10 builds + * Thu Jun 22 2023 Yaakov Selkowitz - 4.1.5-3 - Disable PSM, OrangeFS in RHEL builds