Update package to version 1.5.1

sbd.spec

@@ -1,33 +1,21 @@
-#
+%global longcommit 6bb085f5704dd4c3841c79504f2aed2228e6d76a
-# spec file for package sbd
+%global shortcommit %(echo %{longcommit}|cut -c1-8)
-#
+%global modified %(echo %{longcommit}-|cut -f2 -d-)
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# Copyright (c) 2013 Lars Marowsky-Bree
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-%global commit 7f33d1a409d0a4e2cd69946688c48eaa8f3c5d26
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global github_owner Clusterlabs
-%global buildnum 17
+%global buildnum 1
+%global watchdog_timeout_default 5
+%global sync_resource_startup_sysconfig ""
+
+%bcond_without sync_resource_startup_default
 
 Name:           sbd
 Summary:        Storage-based death
 License:        GPLv2 and MIT
 Group:          System Environment/Daemons
-Version:        1.4.0
+Version:        1.5.1
 Release:        %{buildnum}
 Url:            https://github.com/%{github_owner}/%{name}
-Source0:        https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}_all.tar.gz
+Source0:        https://github.com/%{github_owner}/%{name}/archive/%{longcommit}/%{name}-%{longcommit}.tar.gz
 Patch0:         0001-Fix-the-problem-of-service-error-when-uninstalling.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
@@ -42,6 +30,9 @@ BuildRequires:  libuuid-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  systemd
+BuildRequires:  make
+Conflicts:      fence-agents-sbd < 4.2.1
+Conflicts:      pacemaker-libs < 2.0.5
 
 ExclusiveArch: x86_64 aarch64
 
@@ -50,29 +41,36 @@ ExclusiveArch: x86_64 aarch64
 %endif
 
 %description
-
 This package contains the storage-based death functionality.
+Available rpmbuild rebuild options:
+  --with(out) : sync_resource_startup_default
 
-###########################################################
+%package 	tests
+Summary:        Storage-based death environment for regression tests
+License:        GPLv2 and MIT
+Group:          System Environment/Daemons
+
+%description tests
+This package provides an environment + testscripts for
+regression-testing sbd.
 
 %prep
-%autosetup -p1 -n %{name}-%{commit}
+%autosetup -p1 -n %{name}-%{longcommit}
-
-###########################################################
 
 %build
-autoreconf -i
+./autogen.sh
-export CFLAGS="$RPM_OPT_FLAGS -Wall "
+export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror"
-%configure
+%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} \
+           --with-runstatedir=%{_rundir}
 make %{?_smp_mflags}
 
-###########################################################
 
 %install
-
 make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} install
 rm -rf ${RPM_BUILD_ROOT}%{_libdir}/stonith
-
+install -D -m 0755 tests/regressions.sh $RPM_BUILD_ROOT/usr/share/sbd/regressions.sh
 %if %{defined _unitdir}
 install -D -m 0644 src/sbd.service $RPM_BUILD_ROOT/%{_unitdir}/sbd.service
 install -D -m 0644 src/sbd_remote.service $RPM_BUILD_ROOT/%{_unitdir}/sbd_remote.service
@@ -81,7 +79,10 @@ install -D -m 0644 src/sbd_remote.service $RPM_BUILD_ROOT/%{_unitdir}/sbd_remote
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 src/sbd.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/sbd
 
-###########################################################
+# Don't package static libs
+find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
+find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
+
 
 %clean
 rm -rf %{buildroot}
@@ -111,11 +112,12 @@ fi
 %endif
 
 %files
-###########################################################
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/sysconfig/sbd
 %{_sbindir}/sbd
-#%{_datadir}/sbd
+%{_datadir}/sbd
+%{_datadir}/pkgconfig/sbd.pc
+%exclude %{_datadir}/sbd/regressions.sh
 %doc %{_mandir}/man8/sbd*
 %if %{defined _unitdir}
 %{_unitdir}/sbd.service
@@ -123,11 +125,20 @@ fi
 %endif
 %doc COPYING
 
+%files tests
+%defattr(-,root,root)
+%dir %{_datadir}/sbd
+%{_datadir}/sbd/regressions.sh
+%{_libdir}/libsbdtestbed*
+
 %changelog
+* Thu Feb 02 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 1.5.1-1
+- Update package to version 1.5.1
+
 * Mon Mar 28 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 1.4.0-17
 - Fix the problem of service error when uninstalling
 
-* Thur Dec 16 2021 liqiuyu <liqiuyu@kylinos.cn> - 1.4.0-16
+* Thu Dec 16 2021 liqiuyu <liqiuyu@kylinos.cn> - 1.4.0-16
 - Remove the release suffix
 
 * Fri Oct 30 2020 jiangxinyu <jiangxinyu@kylinos.cn> - 1.4.0-15