1 changed files with 45 additions and 33 deletions
--- a/SPECS/sbd.spec
+++ b/SPECS/sbd.spec
@ -49,7 +49,7 @@ Name:           sbd
 Summary:        Storage-based death
 License:        GPL-2.0-or-later
 Version:        1.5.2
-Release:        %{buildnum}%{?dist}
+Release:        %{buildnum}%{?dist}.5
 Url:            https://github.com/%{github_owner}/%{name}
 Source0:        https://github.com/%{github_owner}/%{name}/archive/%{longcommit}/%{name}-%{longcommit}.tar.gz
 Patch0:         0001-Fix-query-watchdog-avoid-issues-on-heap-allocation-f.patch
@ -69,7 +69,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  make
 BuildRequires:  systemd
 Conflicts:      fence-agents-sbd < 4.5.0
-Conflicts:      pacemaker-libs < 2.1.0-5
+Conflicts:      pacemaker-libs < 2.1.0-6

 %if 0%{?rhel}
 ExclusiveArch: i686 x86_64 s390x aarch64 ppc64le
@ -107,7 +107,7 @@ export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror"
 %configure --with-watchdog-timeout-default=%{watchdog_timeout_default} \
           --with-sync-resource-startup-default=%{?with_sync_resource_startup_default:yes}%{!?with_sync_resource_startup_default:no} \
           --with-sync-resource-startup-sysconfig=%{sync_resource_startup_sysconfig} \
-           --runstatedir=%{_rundir}
+           --with-runstatedir=%{_rundir}
 make %{?_smp_mflags}

 ###########################################################
@ -179,48 +179,60 @@ fi
 %{_libdir}/libsbdtestbed*

 %changelog
-* Tue May 23 2023 Klaus Wenninger <kwenning@redhat.com> - 1.5.2-1
+* Fri Nov 22 2024 Klaus Wenninger <kwenning@redhat.com> - 1.5.2-1.5
+- Bump release for rebuild against pacemaker-3.0.0-rc1 package
+  Resolves: RHEL-68410
+  Resolves: RHEL-67387
+
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.5.2-1.4
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.5.2-1.3
+- Rebuilt for MSVSphere 10
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.2-1.3
+- Bump release for June 2024 mass rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-1.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Feb 3 2023 Klaus Wenninger <kwenning@redhat.com> - 1.5.2-1
 - rebase to upstream v1.5.2
 - convert license naming to SPDX
 - make static analysis happy with a few checks & rearanges with
  dynamic-memory-management

-  Resolves: rhbz#2168579
-
-* Mon Jul 18 2022 Klaus Wenninger <kwenning@redhat.com> - 1.5.1-3
- Be a bit more descriptive on issues opening watchdog-devices
-
-  Resolves: rhbz#2108122
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

-* Mon Dec 6 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.1-2
- obviously autoconf is defining runstatedir - but with a
-  wrong default - directly hand it over to configure
-  and skip --with-runstatedir implemented in configure.ac
-  for older versions of autoconf
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

-  Resolves: rhbz#2011707
+* Mon Jan 31 2022 Klaus Wenninger <kwenning@redhat.com> - 1.5.1-2
+- Having de-allocation in the reverse order compared to
+  allocation seems to make gcc-12 static analysis of
+  dynamic-memory-management happy.

-* Wed Dec 1 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.1-1
- rebase to upstream v1.5.1
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

-  Resolves: rhbz#2013261
+* Fri Nov 19 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.1-1
+- sync with upstream spec-file
+- Rebase to upstream v1.5.1
+- added policy for rhel to gating

-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.0-2.1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Jul 9 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.0-2
- properly conflict with pacemaker not providing sync-default we need
-  Resolves: rhbz#1979961
-  Resolves: rhbz#1979573
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

 * Tue Jul 6 2021 Klaus Wenninger <kwenning@redhat.com> - 1.5.0-1
- sync with fedora sbd-1.5.0-1
-  Resolves: rhbz#1979961
-  Resolves: rhbz#1979573
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.2-3.2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- sync with upstream spec-file
+- Rebase to upstream v1.5.0
+- added fix from upstream for build-regression
+- added fix from upstream for handling leading space in devices

 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.2-3.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild