From 1f0342a057d9c4f532a3210d2a5ff23e0438f3e8 Mon Sep 17 00:00:00 2001
From: Philip Kovacs <pkfed@fedoraproject.org>
Date: Apr 12 2021 18:17:59 +0000
Subject: Add subpackage slurm-slurmrestd (Slurm REST API daemon)


---

diff --git a/slurm.spec b/slurm.spec
index 31938fc..6459e8e 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -16,7 +16,7 @@
 
 Name:           slurm
 Version:        20.11.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Simple Linux Utility for Resource Management
 License:        GPLv2 and BSD
 URL:            https://slurm.schedmd.com/
@@ -77,6 +77,14 @@ BuildRequires:  zlib-devel
 BuildRequires:  ucx-devel
 %endif
 
+# create slurm-slurmrestd package for Fedora >= 34
+%if 0%{fedora} >= 34
+BuildRequires:  http-parser-devel
+BuildRequires:  pkgconfig(json-c)
+BuildRequires:  pkgconfig(libjwt)
+BuildRequires:  pkgconfig(yaml-0.1)
+%endif
+
 # exclude upstream-deprecated 32-bit architectures
 ExcludeArch:    armv7hl
 ExcludeArch:    i686
@@ -168,6 +176,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 Slurm database daemon. Used to accept and process database RPCs and upload
 database changes to slurmctld daemons on each cluster.
 
+%package slurmrestd
+Summary: Slurm REST API deamon
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description slurmrestd
+Slurm REST API daemon.  The slurmrestd daemon is designed to allow clients
+to communicate with Slurm via a REST API.
+
 # -----------------
 # Contribs Packages
 # -----------------
@@ -300,6 +315,7 @@ install -m 0600 -p etc/slurmdbd.conf.example %{buildroot}%{_sysconfdir}/%{name}
 install -m 0644 -p etc/slurmctld.service %{buildroot}%{_unitdir}
 install -m 0644 -p etc/slurmd.service %{buildroot}%{_unitdir}
 install -m 0644 -p etc/slurmdbd.service %{buildroot}%{_unitdir}
+install -m 0644 -p etc/slurmrestd.service %{buildroot}%{_unitdir}
 
 # tmpfiles.d file for creating /run/slurm dir after reboot
 install -d -m 0755 %{buildroot}%{_tmpfilesdir}
@@ -556,9 +572,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
 %files rrdtool
 %{_libdir}/%{name}/ext_sensors_rrd.so
 
-# ---------
-# Slurmctld
-# ---------
+# ---------------
+# Slurm-slurmctld
+# ---------------
 
 %files slurmctld
 %{_mandir}/man8/slurmctld.8*
@@ -566,9 +582,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
 %{_unitdir}/slurmctld.service
 %ghost %{_rundir}/%{name}/slurmctld.pid
 
-# ------
-# Slurmd
-# ------
+# ------------
+# Slurm-slurmd
+# ------------
 
 %files slurmd
 %{_mandir}/man8/slurmd.8*
@@ -578,9 +594,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
 %{_unitdir}/slurmd.service
 %ghost %{_rundir}/%{name}/slurmd.pid
 
-# --------
-# Slurmdbd
-# --------
+# --------------
+# Slurm-slurmdbd
+# --------------
 
 %files slurmdbd
 %config(noreplace) %{_sysconfdir}/%{name}/slurmdbd.conf
@@ -592,6 +608,20 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
 %{_unitdir}/slurmdbd.service
 %ghost %{_rundir}/%{name}/slurmdbd.pid
 
+# ----------------
+# Slurm-slurmrestd
+# ----------------
+
+%files slurmrestd
+%{_libdir}/%{name}/auth_jwt.so
+%{_libdir}/%{name}/openapi_dbv0_0_36.so
+%{_libdir}/%{name}/openapi_v0_0_36.so
+%{_libdir}/%{name}/openapi_v0_0_35.so
+%{_libdir}/%{name}/rest_auth_jwt.so
+%{_libdir}/%{name}/rest_auth_local.so
+%{_sbindir}/slurmrestd
+%{_unitdir}/slurmrestd.service
+
 # --------------
 # Slurm-contribs
 # --------------
@@ -711,6 +741,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod
 %systemd_postun_with_restart slurmdbd.service
 
 %changelog
+* Mon Apr 12 2021 Philip Kovacs <pkfed@fedoraproject.org> - 20.11.5-2
+- Add subpackage slurm-slurmrestd (Slurm REST API daemon)
+
 * Fri Mar 26 2021 Philip Kovacs <pkfed@fedoraproject.org> - 20.11.5-1
 - Release of 20.11.5
 
diff --git a/slurm_without_cray.patch b/slurm_without_cray.patch
index 6ebc6da..c05191a 100644
--- a/slurm_without_cray.patch
+++ b/slurm_without_cray.patch
@@ -5,6 +5,17 @@ index 3f6fac0a85..6c466b4eb5 100644
 @@ -1 +1 @@
 -SUBDIRS = cray lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
 +SUBDIRS = lua mic nss_slurm openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque
+diff --git a/src/plugins/burst_buffer/Makefile.am b/src/plugins/burst_buffer/Makefile.am
+index c187bb83bd..aabd7f3fe8 100644
+--- a/src/plugins/burst_buffer/Makefile.am
++++ b/src/plugins/burst_buffer/Makefile.am
+@@ -2,6 +2,3 @@
+ 
+ SUBDIRS = generic
+ 
+-if WITH_JSON_PARSER
+-SUBDIRS += datawarp
+-endif
 diff --git a/src/plugins/core_spec/Makefile.am b/src/plugins/core_spec/Makefile.am
 index 44b1ed67c0..f06bc541d7 100644
 --- a/src/plugins/core_spec/Makefile.am