From 2d5b49ceae7c8548bf581d0221c58547746f1c030678fbbf1e2cec31d8fe55d0 Mon Sep 17 00:00:00 2001
From: Nicolas Morey <nicolas.morey@suse.com>
Date: Mon, 7 Aug 2023 17:26:37 +0000
Subject: [PATCH] Accepting request 1102755 from
 home:NMorey:branches:science:HPC

- Drop support for obsolete TrueScale (bsc#1212146)

OBS-URL: https://build.opensuse.org/request/show/1102755
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=95
---
 _multibuild      |  3 ---
 mvapich2.changes |  5 +++++
 mvapich2.spec    | 58 +-----------------------------------------------
 3 files changed, 6 insertions(+), 60 deletions(-)

diff --git a/_multibuild b/_multibuild
index eef5940..564f8ab 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,12 +1,9 @@
 <multibuild>
   <package>standard</package>
   <package>testsuite</package>
-  <package>psm</package>
-  <package>psm-testsuite</package>
   <package>psm2</package>
   <package>psm2-testsuite</package>
   <package>gnu-hpc</package>
-  <package>gnu-hpc-psm</package>
   <package>gnu-hpc-psm2</package>
   <package>gnu-hpc-testsuite</package>
 </multibuild>
diff --git a/mvapich2.changes b/mvapich2.changes
index c112176..8e5df9a 100644
--- a/mvapich2.changes
+++ b/mvapich2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  7 16:57:40 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Drop support for obsolete TrueScale (bsc#1212146)
+
 -------------------------------------------------------------------
 Mon Dec  5 21:11:29 UTC 2022 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
diff --git a/mvapich2.spec b/mvapich2.spec
index 09889ec..c8cfcba 100644
--- a/mvapich2.spec
+++ b/mvapich2.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
@@ -38,16 +38,6 @@ ExclusiveArch:  do_not_build
 %{bcond_with hpc}
 %endif
 
-%if "%{flavor}" == "psm"
-%define build_flavor psm
-%{bcond_with hpc}
-%endif
-%if "%{flavor}" == "psm-testsuite"
-%define build_flavor psm
-%define testsuite 1
-%{bcond_with hpc}
-%endif
-
 %if "%{flavor}" == "psm2"
 %define build_flavor psm2
 %{bcond_with hpc}
@@ -72,13 +62,6 @@ ExclusiveArch:  do_not_build
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu-hpc-psm"
-%define compiler_family gnu
-%undefine c_f_ver
-%define build_flavor psm
-%{bcond_without hpc}
-%endif
-
 %if "%flavor" == "gnu-hpc-psm2"
 %define compiler_family gnu
 %undefine c_f_ver
@@ -100,13 +83,6 @@ ExclusiveArch:  do_not_build
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu7-hpc-psm"
-%define compiler_family gnu
-%define c_f_ver 7
-%define build_flavor psm
-%{bcond_without hpc}
-%endif
-
 %if "%flavor" == "gnu7-hpc-psm2"
 %define compiler_family gnu
 %define c_f_ver 7
@@ -128,13 +104,6 @@ ExclusiveArch:  do_not_build
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu8-hpc-psm"
-%define compiler_family gnu
-%define c_f_ver 8
-%define build_flavor psm
-%{bcond_without hpc}
-%endif
-
 %if "%flavor" == "gnu8-hpc-psm2"
 %define compiler_family gnu
 %define c_f_ver 8
@@ -156,13 +125,6 @@ ExclusiveArch:  do_not_build
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu9-hpc-psm"
-%define compiler_family gnu
-%define c_f_ver 9
-%define build_flavor psm
-%{bcond_without hpc}
-%endif
-
 %if "%flavor" == "gnu9-hpc-psm2"
 %define compiler_family gnu
 %define c_f_ver 9
@@ -184,13 +146,6 @@ ExclusiveArch:  do_not_build
 %{bcond_without hpc}
 %endif
 
-%if "%flavor" == "gnu10-hpc-psm"
-%define compiler_family gnu
-%define c_f_ver 10
-%define build_flavor psm
-%{bcond_without hpc}
-%endif
-
 %if "%flavor" == "gnu10-hpc-psm2"
 %define compiler_family gnu
 %define c_f_ver 10
@@ -299,10 +254,6 @@ BuildRequires:  hwloc-devel
 %if %{with pmix}
 BuildRequires:  pmix-devel
 %endif
-%if "%{build_flavor}" == "psm" && %{with skip_hpc_build}
-ExclusiveArch:  %ix86 x86_64
-BuildRequires:  infinipath-psm-devel
-%endif
 %if "%{build_flavor}" == "psm2" && %{with skip_hpc_build}
 ExclusiveArch:  x86_64
 BuildRequires:  libpsm2-devel
@@ -335,9 +286,6 @@ is based on MPICH2 and MVICH.
 Summary:        OSU MVAPICH2 MPI package
 Group:          Development/Libraries/Parallel
 Requires:       %{name} = %{version}
-%if "%{build_flavor}" == "psm"
-Requires:       infinipath-psm-devel
-%endif
 %if "%{build_flavor}" == "psm2"
 Requires:       libpsm2-devel
 %endif
@@ -444,10 +392,6 @@ PERL_USE_UNSAFE_INC=1 ./autogen.sh
 %if %{with pmix}
    --with-pmix=${_prefix} \
 %endif
-%if "%{build_flavor}" == "psm"
-   --with-device=ch3:psm \
-   --with-psm=/usr \
-%endif
 %if "%{build_flavor}" == "psm2"
    --with-device=ch3:psm \
    --with-psm2=/usr \