Hello community,
here is the log from the commit of package cluster-glue for openSUSE:Factory
checked in at 2014-04-03 16:38:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-02-26 23:20:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cluster-glue.new/cluster-glue.changes
2014-04-03 16:38:44.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Mar 31 08:50:24 UTC 2014 - kgronl...@suse.com
+
+- hb_report: Don't use deprecated corosync-fplay (bnc#870913)
+- hb_report: Update FSF address in license
+
+- added patches:
+ * 0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
+ * 0002-hb_report-Update-FSF-address-in-license.patch
+
+-------------------------------------------------------------------
New:
----
0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
0002-hb_report-Update-FSF-address-in-license.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cluster-glue.spec ++++++
--- /var/tmp/diff_new_pack.ADF4PN/_old 2014-04-03 16:38:45.000000000 +0200
+++ /var/tmp/diff_new_pack.ADF4PN/_new 2014-04-03 16:38:45.000000000 +0200
@@ -51,6 +51,11 @@
Patch6:
bnc851990_cluster-glue_external_vcenter_disable_hostname_verification.patch
Patch7: bnc854060_hb_report-add-xz-support.patch
Patch8: bnc863248-logd-add-systemd-support.patch
+# PATCH-FIX-UPSTREAM: hb_report: Don't use deprecated corosync-fplay
(bnc#870913)
+Patch9: 0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch
+# PATCH-FIX-UPSTREAM: hb_report: Update FSF address in license
+Patch10: 0002-hb_report-Update-FSF-address-in-license.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: OpenIPMI-devel
BuildRequires: asciidoc
@@ -157,6 +162,8 @@
%patch6 -p1
%patch7 -p1
%patch8 -p1
+%patch9 -p1
+%patch10 -p1
###########################################################
%build
++++++ 0001-hb_report-Don-t-use-deprecated-corosync-fplay-bnc-87.patch ++++++
>From 3705b041220cb315f3c8f5f89bf594c5ab42abe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Mon, 31 Mar 2014 10:36:50 +0200
Subject: [PATCH 1/2] hb_report: Don't use deprecated corosync-fplay
(bnc#870913)
corosync-fplay is no longer distributed with corosync 2.0.
---
hb_report/hb_report.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hb_report/hb_report.in b/hb_report/hb_report.in
index f53eb996def1..886e782cd2b7 100755
--- a/hb_report/hb_report.in
+++ b/hb_report/hb_report.in
@@ -683,7 +683,7 @@ corosync_blackbox() {
local inpf
inpf=`find_files /var/lib/corosync $from_time $to_time | grep -w fdata`
if [ -f "$inpf" ]; then
- corosync-fplay > $outf
+ corosync-blackbox > $outf
touch -r $inpf $outf
fi
}
--
1.8.4.5
++++++ 0002-hb_report-Update-FSF-address-in-license.patch ++++++
>From c9ad775f37ca75733c5cf6cbcd470d966af4e045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <k...@koru.se>
Date: Mon, 31 Mar 2014 10:38:10 +0200
Subject: [PATCH 2/2] hb_report: Update FSF address in license
Update the FSF address in license of combine-logs.pl
---
hb_report/combine-logs.pl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/hb_report/combine-logs.pl b/hb_report/combine-logs.pl
index 2cfacd7f3176..3fbc100b0d8c 100755
--- a/hb_report/combine-logs.pl
+++ b/hb_report/combine-logs.pl
@@ -9,10 +9,10 @@
#
# usage: combine-logs <log file> [...]
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,7 +21,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
#
# Note by Dejan Muhamedagic <de...@suse.de>
#
--
1.8.4.5
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
