From 776ce8f23b19dfddb884ffcc57a84243e9f25bc3aca4ef8efec650c4715b8d20 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Tue, 25 Oct 2022 11:33:49 +0000
Subject: [PATCH] - Test Suite fixes:   * Update README_Testsuite.md.   * Clean
 up left over files when de-installing test suite.   * Adjustment to test
 suite package: for SLE mark the openmpi4     devel package and slurm-hdf5
 optional.   * Add -ffat-lto-objects to the build flags when LTO is set to    
 make sure the object files we ship with the test suite still     work
 correctly.

OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=224
---
 slurm.changes | 12 ++++++++----
 slurm.spec    | 16 ++++++++++++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/slurm.changes b/slurm.changes
index 6057fd3..8f1ac7a 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,10 +1,14 @@
 -------------------------------------------------------------------
 Fri Oct 21 15:14:30 UTC 2022 - Egbert Eich <eich@suse.com>
 
-- Update README_Testsuite.md.
-- Make hdf5 package optional for test suite.
-- Clean up left over files when de-installing test suite.
-- Adjustment to test suite package: only recommend openmpi4
+- Test Suite fixes:
+  * Update README_Testsuite.md.
+  * Clean up left over files when de-installing test suite.
+  * Adjustment to test suite package: for SLE mark the openmpi4
+    devel package and slurm-hdf5 optional.
+  * Add -ffat-lto-objects to the build flags when LTO is set to
+    make sure the object files we ship with the test suite still
+    work correctly.
 
 -------------------------------------------------------------------
 Fri Oct 14 08:49:24 UTC 2022 - Christian Goll <cgoll@suse.com>
diff --git a/slurm.spec b/slurm.spec
index 0a98679..3653f27 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -576,6 +576,9 @@ Group:          Productivity/Clustering/Computing
 Plugins for specific cray hardware, includes power and knl node management.
 Contains also cray specific documentation.
 
+# Certain packages are not shipped with SLE.
+%define ts_depends %{?sle_version:Recommends}%{!?sle_version:Requires}
+
 %package testsuite
 Summary:        Regression tests from Slurm sources
 Group:          Productivity/Clustering/Computing
@@ -583,7 +586,7 @@ Requires:       %{name} = %version
 Requires:       %{name}-auth-none = %version
 Requires:       %{name}-cray = %version
 Requires:       %{name}-devel = %version
-Recommends:     %{name}-hdf5 = %version
+%{?have_hdf5:%ts_depends:     %{name}-hdf5 = %version}
 Requires:       %{name}-lua = %version
 Requires:       %{name}-munge = %version
 Requires:       %{name}-node = %version
@@ -596,11 +599,12 @@ Requires:       %{name}-sql = %version
 Requires:       %{name}-torque = %version
 Requires:       mariadb
 %{?with_pmix:Requires:       pmix-devel}
+Requires:       bind-utils
 Requires:       bzip2
 Requires:       expect
 Requires:       gcc-c++
 Requires:       libnuma-devel
-Recommends:     openmpi4-gnu-hpc-devel
+%ts_depends:     openmpi4-gnu-hpc-devel
 Requires:       pdsh
 Requires:       perl-%{name} = %version
 Requires:       sudo
@@ -641,6 +645,14 @@ mkdir -p mybin; ln -s /usr/bin/python2 mybin/python3
 # needed as slurm works that way bsc#1200030
 export SUSE_ZNOW=0
 
+# To make stripped object files work which we ship in the
+# testsuite package we need to build with -ffat-lto-objects.
+# This should not affect anything as we do not ship static
+# libraries and object files - except for the testsuite.
+%if "%{?_lto_cflags}" != ""
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
+%endif
+
 autoreconf
 [ -e $(pwd)/mybin ] && PATH=$(pwd)/mybin:$PATH
 %configure --enable-shared \