diff --git a/sbd.spec b/sbd.spec index 19104d5..2ee2b89 100644 --- a/sbd.spec +++ b/sbd.spec @@ -19,7 +19,7 @@ %global shortcommit %(echo %{longcommit}|cut -c1-8) %global modified %(echo %{longcommit}-|cut -f2 -d-) %global github_owner Clusterlabs -%global buildnum 1 +%global buildnum 2 %ifarch s390x s390 # minimum timeout on LPAR diag288 watchdog is 15s @@ -70,7 +70,7 @@ BuildRequires: pkgconfig BuildRequires: make BuildRequires: systemd Conflicts: fence-agents-sbd < 4.5.0 -Conflicts: pacemaker-libs < 2.0.5-10 +Conflicts: pacemaker-libs < 2.1.0-5 %if 0%{?rhel} ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le @@ -179,7 +179,12 @@ fi %{_libdir}/libsbdtestbed* %changelog -Tue Jul 6 2021 Klaus Wenninger - 1.5.0-1 +* Fri Jul 9 2021 Klaus Wenninger - 1.5.0-2 +- properly conflict with pacemaker not providing sync-default we need + Resolves: rhbz#1979961 + Resolves: rhbz#1979573 + +* Tue Jul 6 2021 Klaus Wenninger - 1.5.0-1 - sync with fedora sbd-1.5.0-1 Resolves: rhbz#1979961 Resolves: rhbz#1979573