Hello community, here is the log from the commit of package rabbitmq-server for openSUSE:Factory checked in at 2014-04-05 21:41:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rabbitmq-server (Old) and /work/SRC/openSUSE:Factory/.rabbitmq-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rabbitmq-server" Changes: -------- --- /work/SRC/openSUSE:Factory/rabbitmq-server/rabbitmq-server.changes 2014-03-28 12:13:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rabbitmq-server.new/rabbitmq-server.changes 2014-04-05 21:41:30.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Apr 4 07:55:49 UTC 2014 - dmuel...@suse.com + +- update to 3.3.0: + * long list of security, bugfixes and enhancements + * see http://www.rabbitmq.com/release-notes/README-3.3.0.txt + +------------------------------------------------------------------- +Wed Apr 2 21:03:09 UTC 2014 - vu...@suse.com + +- Add ocf-fixes.patch to fix issues in the OCF file: + - use the wrapper function to call rabbitmqctl for stop, so that + we interpret correctly the exit code. + - accept 1 as valid exit code from "rabbitmqctl status", instead + of totally breaking when we get it. +- We use a patch as the OCF file comes from upstream, so it's + better to keep the changes isolated. + +------------------------------------------------------------------- Old: ---- rabbitmq-server-3.2.4.tar.gz New: ---- ocf-fixes.patch rabbitmq-server-3.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rabbitmq-server.spec ++++++ --- /var/tmp/diff_new_pack.ryPzdo/_old 2014-04-05 21:41:31.000000000 +0200 +++ /var/tmp/diff_new_pack.ryPzdo/_new 2014-04-05 21:41:31.000000000 +0200 @@ -24,7 +24,7 @@ %endif Name: rabbitmq-server -Version: 3.2.4 +Version: 3.3.0 Release: 0 Summary: The RabbitMQ Server License: MPL-1.1 @@ -41,6 +41,7 @@ Source7: rabbitmq-server.tmpfiles.d.conf Patch0: no-nmap.patch Patch1: no-remove-common.patch +Patch10: ocf-fixes.patch BuildRequires: erlang BuildRequires: erlang-src BuildRequires: fdupes @@ -102,6 +103,9 @@ %setup -q %patch0 %patch1 +%define _rabbit_server_ocf `basename %{SOURCE4}` +cp %{SOURCE4} %{_rabbit_server_ocf} +%patch10 -p1 %build make all VERSION=%{version} @@ -127,11 +131,9 @@ # Install wrapper scripts %define _rabbit_wrapper %{_builddir}/`basename %{SOURCE2}` -%define _rabbit_server_ocf %{_builddir}/`basename %{SOURCE4}` cp %{SOURCE2} %{_rabbit_wrapper} sed -i 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' %{_rabbit_wrapper} sed -i 's|/usr/lib/|%{_libdir}/|' %{_rabbit_wrapper} -cp %{SOURCE4} %{_rabbit_server_ocf} install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmqctl install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-server install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugins ++++++ ocf-fixes.patch ++++++ Index: rabbitmq-server-2.8.7/rabbitmq-server.ocf =================================================================== --- rabbitmq-server-2.8.7.orig/rabbitmq-server.ocf +++ rabbitmq-server-2.8.7/rabbitmq-server.ocf @@ -256,7 +256,7 @@ rabbitmqctl_action() { ocf_log debug "RabbitMQ server is running normally" return $OCF_SUCCESS ;; - 2) + 1|2) ocf_log debug "RabbitMQ server is not running" return $OCF_NOT_RUNNING ;; @@ -299,7 +299,7 @@ rabbit_stop() { return $OCF_SUCCESS fi - $RABBITMQ_CTL stop + rabbitmqctl_action stop rc=$? if [ "$rc" != 0 ]; then ++++++ rabbitmq-server-3.2.4.tar.gz -> rabbitmq-server-3.3.0.tar.gz ++++++ ++++ 35667 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
