From f98ecb23d5c7f90dc6dfd109a4b96f6e03850b5038189067dd2b974c451e6386 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 25 Jan 2024 07:58:54 +0000 Subject: [PATCH] - Remove last change. This is not how it is intended to work OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=287 --- slurm.changes | 9 --------- slurm.spec | 10 ++++------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/slurm.changes b/slurm.changes index c85a128..3d89146 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Tue Jan 23 15:59:07 UTC 2024 - Dominique Leuenberger - -- Fix dependency of testsuite when building without hdf5 - (have_hdf5=0). The previously use construct - %{?have_hdf5:%ts_depends: does not behave as intended by the - line-author: %{?…:} does not include a question of value, but - only if the variable is defined or undefind. - ------------------------------------------------------------------- Fri Jan 12 11:08:01 UTC 2024 - Christian Goll diff --git a/slurm.spec b/slurm.spec index 9f683a9..0304d54 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,5 +1,5 @@ # -# spec file for package slurm +# spec file # # Copyright (c) 2024 SUSE LLC # @@ -56,7 +56,7 @@ ExclusiveArch: do_not_build %if 0%{?sle_version} == 150300 || 0%{?sle_version} == 150400 %define base_ver 2011 %endif -%if 0%{?sle_version} == 150500 +%if 0%{?sle_version} == 150500 || 0%{?sle_version} == 150600 %define base_ver 2302 %endif @@ -120,7 +120,7 @@ Conflicts: %{*} } %endif %if 0%{?suse_version} >= 1500 -%define have_hdf5 0 +%undefine have_hdf5 %define have_boolean_deps 1 %define have_lz4 1 %define have_firewalld 1 @@ -584,9 +584,7 @@ Requires: %{name} = %version Requires: %{name}-auth-none = %version Requires: %{name}-cray = %version Requires: %{name}-devel = %version -%if %{?have_hdf5} -%ts_depends: %{name}-hdf5 = %version -%endif +%{?have_hdf5:%ts_depends: %{name}-hdf5 = %version} Requires: %{name}-lua = %version Requires: %{name}-munge = %version Requires: %{name}-node = %version