From 9883ad6d58c897e7f1215152974be05044ba418428b858000d369e905e4730e9 Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Fri, 17 Mar 2023 10:42:09 +0000
Subject: [PATCH] Accepting request 1072585 from
 home:mslacken:branches:network:cluster

- use libpmix.so.2 instead of libpmix.so to fix (bsc#1209260)
  this removes the need of pmix-pluginlib

OBS-URL: https://build.opensuse.org/request/show/1072585
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=245
---
 right-pmix-path.patch | 26 ++++++++++++++++++++++++++
 slurm.changes         |  6 ++++++
 slurm.spec            |  3 ++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 right-pmix-path.patch

diff --git a/right-pmix-path.patch b/right-pmix-path.patch
new file mode 100644
index 0000000..6c0465e
--- /dev/null
+++ b/right-pmix-path.patch
@@ -0,0 +1,26 @@
+From 2e5a2f4fbb4b575694cffb14aa59cb02e5d24486 Mon Sep 17 00:00:00 2001
+From: Christian Goll <cgoll@suse.de>
+Date: Tue, 14 Mar 2023 16:58:41 +0100
+Subject: [PATCH] right pmix path
+
+Signed-off-by: Christian Goll <cgoll@suse.de>
+---
+ src/plugins/mpi/pmix/mpi_pmix.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c
+index dde4d22751..007b556265 100644
+--- a/src/plugins/mpi/pmix/mpi_pmix.c
++++ b/src/plugins/mpi/pmix/mpi_pmix.c
+@@ -137,7 +137,7 @@ static void *_libpmix_open(void)
+ #elif defined PMIXP_V4_LIBPATH
+ 	xstrfmtcat(full_path, "%s/", PMIXP_V4_LIBPATH);
+ #endif
+-	xstrfmtcat(full_path, "libpmix.so");
++	xstrfmtcat(full_path, "libpmix.so.2");
+ 
+ 	lib_plug = dlopen(full_path, RTLD_LAZY | RTLD_GLOBAL);
+ 	xfree(full_path);
+-- 
+2.40.0
+
diff --git a/slurm.changes b/slurm.changes
index 4884a69..fb8e7b4 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 16 15:48:15 UTC 2023 - Christian Goll <cgoll@suse.com>
+
+- use libpmix.so.2 instead of libpmix.so to fix (bsc#1209260)
+  this removes the need of pmix-pluginlib
+
 -------------------------------------------------------------------
 Wed Mar 15 10:19:12 UTC 2023 - Christian Goll <cgoll@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index e03084c..de6ad70 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -141,6 +141,7 @@ Source20:       test_setup.tar.gz
 Source21:       README_Testsuite.md
 Patch0:         Remove-rpath-from-build.patch
 Patch2:         pam_slurm-Initialize-arrays-and-pass-sizes.patch
+Patch3:         right-pmix-path.patch
 Patch10:        Fix-test-21.41.patch
 Patch11:        Fix-test-38.11.patch
 Patch12:        Fix-test-32.8.patch
@@ -399,7 +400,6 @@ Group:          Productivity/Clustering/Computing
 %if %{with pmix}
 Requires:       libpmix%{pmix_so}
 Requires:       pmix
-Requires:       pmix-pluginlib
 %endif
 
 %description plugins
@@ -647,6 +647,7 @@ Do not run test suite and file bug reports for each failed test!
 %setup -q -n %{pname}-%{dl_ver}
 %patch0 -p1
 %patch2 -p1
+%patch3 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1