From f88a1f8e69e2ddf2381c59cb7ef401d5cad8e6ad9aec366ad5b934089aa213ea Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sun, 14 Jul 2019 21:25:41 +0000 Subject: [PATCH] Accepting request 715348 from home:eeich:branches:network:cluster - Fix build for SLE-11-SP4 and older. OBS-URL: https://build.opensuse.org/request/show/715348 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=102 --- slurm.changes | 5 +++++ slurm.spec | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/slurm.changes b/slurm.changes index 4c7c8b6..2e07772 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 14 13:28:13 UTC 2019 - Egbert Eich + +- Fix build for SLE-11-SP4 and older. + ------------------------------------------------------------------- Fri Jul 12 09:04:55 UTC 2019 - Christian Goll diff --git a/slurm.spec b/slurm.spec index 5203a4b..d8e69d0 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1098,9 +1098,10 @@ exit 0 %{_mandir}/man1/sh5util.1.gz %endif +%if 0%{?is_opensuse} || 0%{?have_json_c} %files cray # do not remove cray sepcific packages from SLES update -%if 0%{?is_opensuse} + %if 0%{?is_opensuse} %{_libdir}/slurm/acct_gather_energy_cray.so %{_libdir}/slurm/core_spec_cray.so %{_libdir}/slurm/job_submit_cray.so @@ -1108,9 +1109,12 @@ exit 0 %{_libdir}/slurm/switch_cray.so %{_libdir}/slurm/task_cray.so %{_mandir}/man5/cray.* -%endif + %endif + %if 0%{?have_json_c} %{_libdir}/slurm/burst_buffer_cray.so %{_libdir}/slurm/node_features_knl_cray.so -%{_libdir}/slurm/power_cray.so + %{_libdir}/slurm/power_cray.so +%endif +%endif %changelog