Hello community, here is the log from the commit of package sbd for openSUSE:Factory checked in at 2016-06-23 13:35:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbd (Old) and /work/SRC/openSUSE:Factory/.sbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbd" Changes: -------- --- /work/SRC/openSUSE:Factory/sbd/sbd.changes 2016-03-07 13:24:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sbd.new/sbd.changes 2016-06-23 13:35:54.000000000 +0200 @@ -1,0 +2,11 @@ +Tue May 17 10:59:18 UTC 2016 - [email protected] + +- Update to version 1.2.1.git.1463482437.d6bd23a: + * Add support for diskless sbd mode + +- Remove outdated patches: + * Remove sbd-pacemaker.patch + * Remove sbd-configure-libcoroipcc.patch + * Remove bug-950415_sbd-pacemaker-segfault.patch + +------------------------------------------------------------------- Old: ---- bug-950415_sbd-pacemaker-segfault.patch sbd-1.2.1.git.1409904429.39dee2a.tar.xz sbd-configure-libcoroipcc.patch sbd-pacemaker.patch sbd_remote.service New: ---- sbd-1.2.1.git.1463482437.d6bd23a.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbd.spec ++++++ --- /var/tmp/diff_new_pack.NZRc6w/_old 2016-06-23 13:35:55.000000000 +0200 +++ /var/tmp/diff_new_pack.NZRc6w/_new 2016-06-23 13:35:55.000000000 +0200 @@ -21,15 +21,11 @@ Summary: Storage-based death License: GPL-2.0+ Group: Productivity/Clustering/HA -Version: 1.2.1.git.1409904429.39dee2a +Version: 1.2.1.git.1463482437.d6bd23a Release: 0 Url: https://github.com/l-mb/sbd Source: %{name}-%{version}.tar.xz -Source1: sbd_remote.service Patch1: add-explicit-libs.patch -Patch2: sbd-configure-libcoroipcc.patch -Patch3: sbd-pacemaker.patch -Patch4: bug-950415_sbd-pacemaker-segfault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -39,6 +35,7 @@ BuildRequires: libcorosync-devel BuildRequires: libglue-devel BuildRequires: libpacemaker-devel +BuildRequires: libqb-devel BuildRequires: libtool BuildRequires: libuuid-devel BuildRequires: libxml2-devel @@ -56,40 +53,27 @@ This package contains the storage-based death functionality. %prep -########################################################### # %setup -n sbd-%{version} -q -%setup -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -########################################################### +%autosetup -p1 %build autoreconf -i export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror" %configure make %{?_smp_mflags} -########################################################### %install -########################################################### make DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} install install -D -m 0755 src/sbd.sh $RPM_BUILD_ROOT/usr/share/sbd/sbd.sh %if %{defined _unitdir} install -D -m 0644 src/sbd.service $RPM_BUILD_ROOT/%{_unitdir}/sbd.service -install -D -m 0644 %{S:1} $RPM_BUILD_ROOT/%{_unitdir}/sbd_remote.service +install -D -m 0644 src/sbd_remote.service $RPM_BUILD_ROOT/%{_unitdir}/sbd_remote.service %endif mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates cp -f src/sbd.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.sbd %clean -########################################################### -if - [ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ] -then - rm -rf $RPM_BUILD_ROOT || true -fi +rm -rf %{buildroot} %if %{defined _unitdir} %post @@ -114,7 +98,6 @@ %endif %files -########################################################### %defattr(-,root,root) %{_libdir}/stonith/plugins/external/sbd %{_sbindir}/sbd ++++++ _service ++++++ --- /var/tmp/diff_new_pack.NZRc6w/_old 2016-06-23 13:35:55.000000000 +0200 +++ /var/tmp/diff_new_pack.NZRc6w/_new 2016-06-23 13:35:55.000000000 +0200 @@ -2,7 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="url">https://github.com/l-mb/sbd.git</param> + <param name="url">https://github.com/krig/sbd.git</param> + <param name="revision">opensuse</param> <param name="versionformat">1.2.1.git.%ct.%h</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.NZRc6w/_old 2016-06-23 13:35:55.000000000 +0200 +++ /var/tmp/diff_new_pack.NZRc6w/_new 2016-06-23 13:35:55.000000000 +0200 @@ -2,4 +2,6 @@ <service name="tar_scm"> <param name="url">https://github.com/l-mb/sbd.git</param> <param name="changesrevision">39dee2ac89</param></service> -</servicedata> \ No newline at end of file +<service name="tar_scm"> + <param name="url">https://github.com/krig/sbd.git</param> + <param name="changesrevision">d6bd23a66e59801206fcb8bd265a5effad239478</param></service></servicedata> \ No newline at end of file ++++++ add-explicit-libs.patch ++++++ --- /var/tmp/diff_new_pack.NZRc6w/_old 2016-06-23 13:35:55.000000000 +0200 +++ /var/tmp/diff_new_pack.NZRc6w/_new 2016-06-23 13:35:55.000000000 +0200 @@ -1,12 +1,17 @@ -Index: sbd/src/Makefile.am -=================================================================== ---- sbd.orig/src/Makefile.am -+++ sbd/src/Makefile.am -@@ -8,5 +8,6 @@ sbin_PROGRAMS = sbd - - sbd_SOURCES = sbd-common.c sbd-md.c sbd-pacemaker.c +commit f83be72289356e013a94b04c01c5e91e0e7dec2e +Author: Kristoffer Grönlund <[email protected]> +Date: Tue May 17 13:29:34 2016 +0200 + + add explicit libraries to build process + +diff --git a/src/Makefile.am b/src/Makefile.am +index f18b2b1..a788236 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -11,5 +11,4 @@ if SUPPORT_SHARED_DISK + sbd_SOURCES += sbd-md.c + endif -sbd_LDFLAGS = $(glib_LIBS) $(libcoroipcc_LIBS) -+sbd_LDADD = $(glib_LIBS) $(libcoroipcc_LIBS) -lplumb -luuid -lqb -+#sbd_LDADD = -lplumb -luuid - +- ++sbd_LDADD = $(glib_LIBS) $(libcoroipcc_LIBS) -luuid -lqb ++++++ sbd-1.2.1.git.1409904429.39dee2a.tar.xz -> sbd-1.2.1.git.1463482437.d6bd23a.tar.xz ++++++ ++++ 6610 lines of diff (skipped)
