From e22daa9ce54c79dc9a30a4fb4054c953183263b2ea81358dde37add5179dc89c Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Wed, 8 Sep 2021 07:34:10 +0000
Subject: [PATCH] Accepting request 917243 from
 home:eeich:branches:network:cluster

- Fix-statement-condition-in-netloc-autoconf-macro.patch:
  Fix netloc check, reestablish netloc disable code.
- Make configure arg '--with-pmix' conditional.
- Move openapi plugins to package slurm-restd.

OBS-URL: https://build.opensuse.org/request/show/917243
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=185
---
 ...t-condition-in-netloc-autoconf-macro.patch | 42 +++++++++++++++++++
 slurm.changes                                 |  8 ++++
 slurm.spec                                    | 17 ++++++--
 3 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 Fix-statement-condition-in-netloc-autoconf-macro.patch

diff --git a/Fix-statement-condition-in-netloc-autoconf-macro.patch b/Fix-statement-condition-in-netloc-autoconf-macro.patch
new file mode 100644
index 0000000..f8f2c29
--- /dev/null
+++ b/Fix-statement-condition-in-netloc-autoconf-macro.patch
@@ -0,0 +1,42 @@
+From 1f8be9ffb586b8bc3e5c7bf45cef16db5bf9b479 Mon Sep 17 00:00:00 2001
+From: Tim McMullan <mcmullan@schedmd.com>
+Date: Thu, 26 Aug 2021 16:58:37 -0600
+Subject: [PATCH] Fix statement condition in netloc autoconf macro.
+
+Includes output of running 'autoreconf -i'.
+Continuation of d7c089ec63.
+
+Bug 12370
+---
+ NEWS                  | 1 +
+ auxdir/x_ac_netloc.m4 | 2 +-
+ configure             | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+--- a/auxdir/x_ac_netloc.m4
++++ b/auxdir/x_ac_netloc.m4
+@@ -21,7 +21,7 @@ AC_DEFUN([X_AC_NETLOC],
+     [AS_IF([test "x$with_netloc" != xno && test "x$with_netloc" != xyes],
+            [_x_ac_netloc_dirs="$with_netloc"])])
+ 
+-  if [test "$with_netloc" = xno]; then
++  if [test "x$with_netloc" = xno]; then
+     AC_MSG_WARN([support for netloc disabled])
+   else
+     AC_CACHE_CHECK(
+diff --git a/configure b/configure
+index 3dbe39b9b8..d563cfcd56 100755
+--- a/configure
++++ b/configure
+@@ -24168,7 +24168,7 @@ fi
+ fi
+ 
+ 
+-  if test "$with_netloc" = xno; then
++  if test "x$with_netloc" = xno; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: support for netloc disabled" >&5
+ $as_echo "$as_me: WARNING: support for netloc disabled" >&2;}
+   else
+-- 
+2.26.2
+
diff --git a/slurm.changes b/slurm.changes
index 581758c..3767013 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Sep  6 15:34:06 UTC 2021 - Egbert Eich <eich@suse.com>
+
+- Fix-statement-condition-in-netloc-autoconf-macro.patch:
+  Fix netloc check, reestablish netloc disable code.
+- Make configure arg '--with-pmix' conditional.
+- Move openapi plugins to package slurm-restd.
+
 -------------------------------------------------------------------
 Thu Sep  2 13:19:33 UTC 2021 - Christian Goll <cgoll@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index 862215d..d98797e 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package slurm
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -87,6 +87,10 @@ ExclusiveArch:  do_not_build
 %define build_slurmrestd 1
 %endif
 
+%if 0
+%define have_netloc 1
+%endif
+
 %if 0%{?is_opensuse} && 0%{!?sle_version:1}
 %define is_factory 1
 %endif
@@ -131,6 +135,7 @@ Patch0:         Remove-rpath-from-build.patch
 Patch1:         slurm-2.4.4-init.patch
 Patch2:         pam_slurm-Initialize-arrays-and-pass-sizes.patch
 Patch3:         load-pmix-major-version.patch
+Patch100:       Fix-statement-condition-in-netloc-autoconf-macro.patch
 
 %{?upgrade:Provides: %{pname} = %{version}}
 %{?upgrade:Conflicts: %{pname}}
@@ -542,6 +547,7 @@ Contains also cray specific documentation.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch100 -p1
 %if 0%{?python_ver} < 3
 # Workaround for wrongly flagged python3 to keep SLE-11-SP4 building
 mkdir -p mybin; ln -s /usr/bin/python2 mybin/python3
@@ -556,11 +562,12 @@ autoreconf
            --without-rpath \
            --without-datawarp \
            --with-shared-libslurm \
-           --with-pmix=/usr/ \
+           %{?with_pmix:--with-pmix=/usr/} \
 %if 0%{?build_slurmrestd}
            --enable-slurmrestd \
 %endif
 	   --with-yaml \
+%{!?have_netloc:--without-netloc} \
            --sysconfdir=%{_sysconfdir}/%{pname} \
 %{!?have_hdf5:--without-hdf5} \
 %{!?have_lz4:--without-lz4} \
@@ -727,6 +734,7 @@ EOF
 # Temporary - remove when build is fixed upstream.
 %if !0%{?build_slurmrestd}
 rm -f %{buildroot}/%{_mandir}/man8/slurmrestd.*
+rm -f %{buildroot}/%{_libdir}/slurm/openapi_*
 %endif
 
 %check
@@ -924,6 +932,7 @@ exit 0
 %{_bindir}/sshare
 %{_bindir}/sstat
 %{_bindir}/strigger
+%{?have_netloc:%{_bindir}/netloc_to_topology}
 %{_sbindir}/slurmctld
 %{_sbindir}/slurmsmwd
 %dir %{_libdir}/slurm/src
@@ -1102,8 +1111,6 @@ exit 0
 %{_libdir}/slurm/mpi_pmix_v3.so
 %endif
 %{_libdir}/slurm/node_features_helpers.so
-%{_libdir}/slurm/openapi_dbv0_0_37.so
-%{_libdir}/slurm/openapi_v0_0_37.so
 %{_libdir}/slurm/power_none.so
 %{_libdir}/slurm/preempt_none.so
 %{_libdir}/slurm/preempt_partition_prio.so
@@ -1182,6 +1189,8 @@ exit 0
 %{?comp_at}
 %{_sbindir}/slurmrestd
 %{_mandir}/man8/slurmrestd.*
+%{_libdir}/slurm/openapi_dbv0_0_37.so
+%{_libdir}/slurm/openapi_v0_0_37.so
 %{_libdir}/slurm/openapi_dbv0_0_36.so
 %{_libdir}/slurm/openapi_v0_0_35.so
 %{_libdir}/slurm/openapi_v0_0_36.so