From 5a25a5ea8bd6a146858571896353109af7e1f65aa0950c58cdc391e0aa173683 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Mon, 8 Jul 2019 05:48:14 +0000
Subject: [PATCH] Accepting request 713918 from home:eeich:slurm-staging

- Add BuildRequires to address warnings during build:
  * for libcurl-devel, libssh2-devel and rrdtool-devel
  * for libjson-c-devel and liblz4-devel where available,
    disable these with --without-json and --without-lz4
    where not.
  * disable DataWarp (--without-datawarp).

OBS-URL: https://build.opensuse.org/request/show/713918
OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=98
---
 slurm.changes | 10 ++++++++++
 slurm.spec    | 24 ++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/slurm.changes b/slurm.changes
index 642ccf7..d6811d5 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jul  8 05:41:11 UTC 2019 - Egbert Eich <eich@suse.com>
+
+- Add BuildRequires to address warnings during build:
+  * for libcurl-devel, libssh2-devel and rrdtool-devel
+  * for libjson-c-devel and liblz4-devel where available,
+    disable these with --without-json and --without-lz4
+    where not.
+  * disable DataWarp (--without-datawarp).
+
 -------------------------------------------------------------------
 Sat Jul  6 20:07:53 UTC 2019 - Egbert Eich <eich@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index 462345b..b33f4bf 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -49,7 +49,9 @@
  %define with_systemd 1
 %endif
 %if 0%{?suse_version:1} && 0%{?suse_version} <= 1140
-%define comp_at %defattr(-,root,root)
+ %define comp_at %defattr(-,root,root)
+%else
+ %define have_json_c 1
 %endif
 
 %if 0
@@ -63,6 +65,7 @@
 %if 0%{?is_factory} || 0%{?sle_version} >= 150000
 %define have_hdf5 1
 %define have_boolean_deps 1
+%define have_lz4 1
 %endif
 
 %ifarch x86_64
@@ -148,6 +151,15 @@ BuildRequires:  libhwloc-devel
 BuildRequires:  freeipmi-devel
 %endif
 %endif
+BuildRequires:  libcurl-devel
+%if 0%{?have_json_c}
+BuildRequires:  libjson-c-devel
+%endif
+%if 0%{?have_lz4}
+BuildRequires:  liblz4-devel
+%endif
+BuildRequires:  libssh2-devel
+BuildRequires:  rrdtool-devel
 %if 0%{?with_systemd}
 %{?systemd_requires}
 BuildRequires:  systemd
@@ -447,8 +459,13 @@ sh5utils to merge this hdf5 files or extract data from them.
 %configure --enable-shared \
            --disable-static \
            --without-rpath \
+           --without-datawarp \
 %{!?have_netloc:--without-netloc} \
-           --sysconfdir=%{_sysconfdir}/%{pname}
+           --sysconfdir=%{_sysconfdir}/%{pname} \
+%{!?have_hdf5:--without-hdf5} \
+%{!?have_lz4:--without-lz4} \
+%{!?have_jasonc:--without-json}
+
 make %{?_smp_mflags}
 
 %install
@@ -980,6 +997,9 @@ exit 0
 %endif
 %endif
 %{_libdir}/slurm/node_features_knl_generic.so
+%{_libdir}/slurm/acct_gather_profile_influxdb.so
+%{_libdir}/slurm/ext_sensors_rrd.so
+%{_libdir}/slurm/jobcomp_elasticsearch.so
 
 %files lua
 %{?comp_at}