Sync from SUSE:SLFO:Main sbd revision 739ceda17d1ff1ad8c09f1f139a959dd

sbd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 12 17:32:38 UTC 2025 - Yan Gao <ygao@suse.com>
+
+- spec: drop Linux-HA fence agent external/sbd in favor of fence_sbd agent for suse_version >= 1600
+- spec: add systemd to BuildRequires
+
 -------------------------------------------------------------------
 Mon Dec 09 08:24:47 UTC 2024 - Yan Gao <ygao@suse.com>
 

sbd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sbd
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2013 Lars Marowsky-Bree
 #
 # All modifications and additions to the file contributed by third parties
@@ -78,6 +78,7 @@ BuildRequires:  pkgconfig(libqb)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(pacemaker)
 BuildRequires:  pkgconfig(pacemaker-cib)
+BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(uuid)
 Requires(post): %fillup_prereq
 Conflicts:      ClusterTools2 < 2.3.2
@@ -126,6 +127,11 @@ make %{?_smp_mflags}
 
 %install
 %make_install LIBDIR=%{_libdir}
+
+%if %{suse_version} >= 1600
+rm -rf %{buildroot}%{_libdir}/stonith
+%endif
+
 install -D -m 0755 src/sbd.sh %{buildroot}%{_datadir}/sbd/sbd.sh
 install -D -m 0755 tests/regressions.sh %{buildroot}%{_datadir}/sbd/regressions.sh
 install -D -m 0644 src/sbd.service %{buildroot}/%{_unitdir}/sbd.service
@@ -162,7 +168,9 @@ fi
 
 %files
 %defattr(-,root,root)
+%if %{suse_version} < 1600
 %{_libdir}/stonith/
+%endif
 %{_sbindir}/sbd
 %{_sbindir}/rcsbd
 %{_sbindir}/rcsbd_remote