From 0f488b890cc9e009d18c70ae139bdb016b2be101 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sat, 1 Aug 2020 18:48:53 +0000 Subject: [PATCH] import sbd-1.4.1-7.el8 --- SPECS/sbd.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/SPECS/sbd.spec b/SPECS/sbd.spec index 0e7f257..0a15574 100644 --- a/SPECS/sbd.spec +++ b/SPECS/sbd.spec @@ -18,7 +18,7 @@ %global commit 25fce8a7d5e8cd5abc2379077381b10bd6cec183 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global github_owner Clusterlabs -%global buildnum 6 +%global buildnum 7 Name: sbd Summary: Storage-based death @@ -49,7 +49,7 @@ BuildRequires: pkgconfig BuildRequires: systemd BuildRequires: make Conflicts: fence-agents-sbd < 4.2.1-38 -Requires: pacemaker >= 2.0.4-5 +Conflicts: pacemaker-libs < 2.0.4-5 %if 0%{?rhel} > 0 ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 @@ -161,6 +161,12 @@ fi %{_libdir}/libsbdtestbed* %changelog +* Thu Jul 30 2020 Klaus Wenninger - 1.4.1-7 +- conflict with pacemaker-libs < 2.0.4-5 instead of requiring + a minimum pacemaker version + + Resolves: rhbz#1861713 + * Mon Jul 27 2020 Klaus Wenninger - 1.4.1-6 - match qdevice-sync_timeout against wd-timeout - sync startup/shutdown via pacemakerd-api