Hello community, here is the log from the commit of package cluster-glue for openSUSE:Factory checked in at 2016-05-31 12:09:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cluster-glue (Old) and /work/SRC/openSUSE:Factory/.cluster-glue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cluster-glue" Changes: -------- --- /work/SRC/openSUSE:Factory/cluster-glue/cluster-glue.changes 2016-02-11 12:33:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes 2016-05-31 12:09:09.000000000 +0200 @@ -1,0 +2,9 @@ +Mon May 23 19:14:33 UTC 2016 - [email protected] + +- Update to 1.0.12+hg2818 + + Fix addresses of FSF, point to gnu.org/licenses instead + +- Fix build with GCC 6 + + Add remove-unused-constants.patch + +------------------------------------------------------------------- Old: ---- cluster-glue-1.0.12+hg2816.tar.bz2 New: ---- cluster-glue-1.0.12+hg2818.tar.bz2 remove-unused-constants.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cluster-glue.spec ++++++ --- /var/tmp/diff_new_pack.TppV2Z/_old 2016-05-31 12:09:10.000000000 +0200 +++ /var/tmp/diff_new_pack.TppV2Z/_new 2016-05-31 12:09:10.000000000 +0200 @@ -39,7 +39,7 @@ Summary: Reusable cluster components License: GPL-2.0 and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 1.0.12+hg2816 +Version: 1.0.12+hg2818 Release: 0 Url: http://www.linux-ha.org/wiki/Cluster_Glue Source: %{name}-%{version}.tar.bz2 @@ -51,6 +51,8 @@ Patch4: cluster-glue_droplrm.patch # PATCH-FIX-OPENSUSE: fix build with GCC 59 Patch6: cluster-glue-gcc5.patch +# PATCH-FIX-OPENSUSE: fix build with GCC 6 +Patch7: remove-unused-constants.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: OpenIPMI-devel BuildRequires: asciidoc @@ -144,12 +146,7 @@ such as Pacemaker. %prep -########################################################### -%setup -q -%patch1 -p1 -%patch4 -p1 -%patch6 -p1 -########################################################### +%autosetup -p1 %build cp %{S:3} ./hb_report/hb_report.in @@ -180,10 +177,8 @@ --docdir=%{glue_docdir} %endif make %{?_smp_mflags} -########################################################### %install -########################################################### make DESTDIR=$RPM_BUILD_ROOT install # Dont package static libs or compiled python find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f @@ -194,8 +189,6 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rclogd %endif -########################################################### - %pre if getent group %{gname} >/dev/null @@ -235,7 +228,6 @@ /sbin/ldconfig %files -########################################################### %defattr(-,root,root) %dir %{_libdir}/heartbeat %dir %{_var}/lib/heartbeat ++++++ cluster-glue-1.0.12+hg2816.tar.bz2 -> cluster-glue-1.0.12+hg2818.tar.bz2 ++++++ ++++ 3173 lines of diff (skipped) ++++++ remove-unused-constants.patch ++++++ diff --git a/logd/ha_logd.c b/logd/ha_logd.c --- a/logd/ha_logd.c +++ b/logd/ha_logd.c @@ -75,9 +75,6 @@ #define EOS '\0' #define nullchk(a) ((a) ? (a) : "<null>") -static const int logd_keepalive_ms = 1000; -static const int logd_warntime_ms = 5000; -static const int logd_deadtime_ms = 10000; static gboolean verbose = FALSE; static pid_t write_process_pid; static IPC_Channel *chanspair[2];
