From 47fc7262636a8570818ec033f778ccaf044b61d90adf50b5ddc6ab47e3946da4 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Tue, 4 May 2021 08:36:53 +0000
Subject: [PATCH] Accepting request 890261 from
 home:eeich:branches:network:cluster

- Ship REST API version and auth plugins with slurmrestd.
- Add YAML support for REST API to build (bsc#1185603).

OBS-URL: https://build.opensuse.org/request/show/890261
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=177
---
 slurm.changes |  6 ++++++
 slurm.spec    | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/slurm.changes b/slurm.changes
index 9fcc671..ec8f663 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May  3 16:09:44 UTC 2021 - Egbert Eich <eich@suse.com>
+
+- Ship REST API version and auth plugins with slurmrestd.
+- Add YAML support for REST API to build (bsc#1185603).
+
 -------------------------------------------------------------------
 Wed Mar 17 08:55:58 UTC 2021 - Christian Goll <cgoll@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index e24eb94..0d3d944 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -191,6 +191,7 @@ BuildRequires:  libjson-c-devel
 BuildRequires:  liblz4-devel
 %endif
 BuildRequires:  libssh2-devel
+BuildRequires:  libyaml-devel
 BuildRequires:  rrdtool-devel
 %if 0%{?with_systemd}
 %{?systemd_ordering}
@@ -563,6 +564,7 @@ autoreconf
 %if 0%{?build_slurmrestd}
            --enable-slurmrestd \
 %endif
+	   --with-yaml \
 %{!?have_netloc:--without-netloc} \
            --sysconfdir=%{_sysconfdir}/%{pname} \
 %{!?have_hdf5:--without-hdf5} \
@@ -1105,13 +1107,6 @@ exit 0
 %{_libdir}/slurm/mpi_pmix.so
 %{_libdir}/slurm/mpi_pmix_v3.so
 %endif
-%if 0%{?build_slurmrestd}
-%{_libdir}/slurm/openapi_dbv0_0_36.so
-%{_libdir}/slurm/openapi_v0_0_35.so
-%{_libdir}/slurm/openapi_v0_0_36.so
-%{_libdir}/slurm/rest_auth_jwt.so
-%{_libdir}/slurm/rest_auth_local.so
-%endif
 %{_libdir}/slurm/power_none.so
 %{_libdir}/slurm/preempt_none.so
 %{_libdir}/slurm/preempt_partition_prio.so
@@ -1188,6 +1183,11 @@ exit 0
 %{?comp_at}
 %{_sbindir}/slurmrestd
 %{_mandir}/man8/slurmrestd.*
+%{_libdir}/slurm/openapi_dbv0_0_36.so
+%{_libdir}/slurm/openapi_v0_0_35.so
+%{_libdir}/slurm/openapi_v0_0_36.so
+%{_libdir}/slurm/rest_auth_jwt.so
+%{_libdir}/slurm/rest_auth_local.so
 %endif
 
 %files node