From f2775f6e1eb3faf455860c493152440696324ffa0841dfe5e5352d9578258cf4 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sat, 17 Aug 2019 14:25:47 +0000 Subject: [PATCH] - Fix logic of slurm-munge recommends: slurm-munge requires munge already, so if we have munge installed we recommend slurm-munge as the authentication when installing slurm or slurm-node. OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=108 --- slurm.changes | 7 +++++++ slurm.spec | 17 +++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/slurm.changes b/slurm.changes index 7999b89..54a39ae 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Aug 17 14:20:35 UTC 2019 - Egbert Eich + +- Fix logic of slurm-munge recommends: slurm-munge requires munge + already, so if we have munge installed we recommend slurm-munge + as the authentication when installing slurm or slurm-node. + ------------------------------------------------------------------- Sun Jul 14 13:28:13 UTC 2019 - Egbert Eich diff --git a/slurm.spec b/slurm.spec index d8e69d0..31d332d 100644 --- a/slurm.spec +++ b/slurm.spec @@ -116,13 +116,14 @@ Patch12: pam_slurm_adopt-use-uid-to-determine-whether-root-is.patch Requires: %{name}-config = %{version} %if 0%{?have_boolean_deps} -Requires: (munge if %{name}-munge) +Recommends: (%{name}-munge = %version if munge) %else -Requires: munge +Recommends: %{name}-munge = %version %endif Requires(pre): %{name}-node = %{version} Recommends: %{name}-doc = %{version} Recommends: %{name}-config-man = %{version} +BuildRequires: coreutils BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gtk2-devel @@ -279,7 +280,11 @@ Group: Productivity/Clustering/Computing Requires: %{name}-config = %{version} Requires: %{name}-plugins = %{version} Requires: %{name}-sql = %{version} -Recommends: %{name}-munge = %{version} +%if 0%{?have_boolean_deps} +Recommends: (%{name}-munge = %version if munge) +%else +Recommends: %{name}-munge = %version +%endif %if 0%{?with_systemd} %{?systemd_requires} %else @@ -394,7 +399,11 @@ Summary: Minimal slurm node Group: Productivity/Clustering/Computing Requires: %{name}-config = %{version} Requires: %{name}-plugins = %{version} -Recommends: %{name}-munge +%if 0%{?have_boolean_deps} +Recommends: (%{name}-munge = %version if munge) +%else +Recommends: %{name}-munge = %version +%endif %if 0%{?with_systemd} %{?systemd_requires} %else