commit 8e062442bd3495f09ca3ced8084ffefb9118067e
Author: Jakub Bogusz <[email protected]>
Date: Sun May 31 17:13:30 2020 +0200
- updated to 1.4.1
- removed obsolete coro patch, upstream is ready for corosync 2 now
cluster-sbd.spec | 32 ++++++++++++++++++++++++--------
sbd-coro.patch | 31 -------------------------------
2 files changed, 24 insertions(+), 39 deletions(-)
---
diff --git a/cluster-sbd.spec b/cluster-sbd.spec
index 65cb953..6f49ecc 100644
--- a/cluster-sbd.spec
+++ b/cluster-sbd.spec
@@ -2,26 +2,30 @@
Summary: Shared-storage based death
Summary(pl.UTF-8): Uśmiercanie węzła poprzez współdzieloną przestrzeń
dyskową
Name: cluster-sbd
-Version: 1.2.0
+Version: 1.4.1
Release: 1
License: GPL v2+
Group: Daemons
#Source0Download: https://github.com/ClusterLabs/sbd/releases
Source0:
https://github.com/ClusterLabs/sbd/archive/v%{version}/sbd-%{version}.tar.gz
-# Source0-md5: 59d4aeaa8470ccecfc6af375532a6e05
-Patch0: sbd-coro.patch
+# Source0-md5: 506253d40490d49a8effc0f563bcd666
URL: https://github.com/ClusterLabs/sbd/
BuildRequires: autoconf >= 2.63
-BuildRequires: automake
-BuildRequires: cluster-glue-libs-devel >= 1.0.9
-BuildRequires: corosync-devel >= 1.4
+# for serial-tests
+BuildRequires: automake >= 1:1.13
+BuildRequires: corosync-devel >= 2.0
BuildRequires: glib2-devel >= 2.0
BuildRequires: libaio-devel
+BuildRequires: libqb-devel
+BuildRequires: libtool
+BuildRequires: libuuid-devel
BuildRequires: libxml2-devel >= 2.0
BuildRequires: pacemaker-devel >= 1.1.8
BuildRequires: perl-tools-pod
BuildRequires: pkgconfig
Requires: cluster-glue-stonith >= 1.0.9
+Requires: corosync-libs >= 2.0
+Requires: pacemaker-libs >= 1.1.8
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -42,14 +46,24 @@ z klastrami wykorzystującymi "starą" wtyczkę corosync, nie
kod MCP).
%prep
%setup -q -n sbd-%{version}
-%patch0 -p1
+
+# see autogen.sh
+echo 'm4_define([TESTS_OPTION], [serial-tests])' > tests-opt.m4
%build
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+cd tests
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
+%configure \
+ --disable-static
%{__make}
@@ -59,6 +73,8 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsbdtestbed.*
+
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/sbd-coro.patch b/sbd-coro.patch
deleted file mode 100644
index 02d9b55..0000000
--- a/sbd-coro.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- sbd-1.2.0/configure.ac.orig 2016-10-22 21:55:35.214353481 +0200
-+++ sbd-1.2.0/configure.ac 2016-10-22 21:55:38.464353444 +0200
-@@ -29,7 +29,6 @@
- AM_PROG_CC_C_O
-
- PKG_CHECK_MODULES(glib, [glib-2.0])
--PKG_CHECK_MODULES(libcoroipcc, [libcoroipcc])
-
- dnl pacemaker > 1.1.8
- PKG_CHECK_MODULES(pacemaker, [pacemaker, pacemaker-cib], HAVE_pacemaker=1,
HAVE_pacemaker=0)
---- sbd-1.2.0/src/Makefile.am.orig 2013-07-04 12:22:36.000000000 +0200
-+++ sbd-1.2.0/src/Makefile.am 2016-10-22 22:50:18.537649324 +0200
-@@ -8,5 +8,5 @@
-
- sbd_SOURCES = sbd-common.c sbd-md.c sbd-pacemaker.c
-
--sbd_LDFLAGS = $(glib_LIBS) $(libcoroipcc_LIBS)
-+sbd_LDFLAGS = $(glib_LIBS) $(libcoroipcc_LIBS) -lqb -luuid -lplumb
-
---- sbd-1.2.0/src/sbd-pacemaker.c.orig 2013-07-04 12:22:36.000000000 +0200
-+++ sbd-1.2.0/src/sbd-pacemaker.c 2016-10-22 22:51:12.680982040 +0200
-@@ -227,7 +227,9 @@
- ais_membership_destroy(gpointer user_data)
- {
- cl_log(LOG_ERR, "AIS connection terminated - corosync down?");
-+#if 0
- ais_fd_sync = -1;
-+#endif
- /* TODO: Is recovery even worth it here? After all, this means
- * that corosync died ... */
- exit(1);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cluster-sbd.git/commitdiff/8e062442bd3495f09ca3ced8084ffefb9118067e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
