diff --git a/.gitignore b/.gitignore index b5e8d91..bb07c87 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ rabbitmq-server-1.8.0.tar.gz /rabbitmq-server-3.4.2.tar.gz /rabbitmq-server-3.4.3.tar.gz /rabbitmq-server-3.4.4.tar.gz +/rabbitmq-server-3.5.0.tar.gz diff --git a/rabbitmq-server-systemd-notify-support.patch b/rabbitmq-server-systemd-notify-support.patch deleted file mode 100644 index 733635f..0000000 --- a/rabbitmq-server-systemd-notify-support.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rabbitmq-server-3.4.0/src/rabbit.erl.orig 2014-10-22 09:23:41.578344937 -0400 -+++ rabbitmq-server-3.4.0/src/rabbit.erl 2014-10-22 09:26:41.543213183 -0400 -@@ -323,6 +323,8 @@ - Plugins = rabbit_plugins:setup(), - ToBeLoaded = Plugins ++ ?APPS, - start_apps(ToBeLoaded), -+ {module, sd_notify} == code:load_file(sd_notify) andalso -+ sd_notify:sd_notify(0, "READY=1"), - ok = log_broker_started(rabbit_plugins:active()). - - start_it(StartFun) -> diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec index 1b5198d..789f1c1 100644 --- a/rabbitmq-server.spec +++ b/rabbitmq-server.spec @@ -2,7 +2,7 @@ Name: rabbitmq-server -Version: 3.4.4 +Version: 3.5.0 Release: 1%{?dist} License: MPLv1.1 Group: Development/Libraries @@ -53,9 +53,6 @@ Requires(preun):initscripts # https://bugzilla.redhat.com/show_bug.cgi?id=1032595#c8 Patch0: rabbitmq-probe-ephemeral-port.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1103524 -Patch1: rabbitmq-server-systemd-notify-support.patch - %description RabbitMQ is an implementation of AMQP, the emerging standard for high performance enterprise messaging. The RabbitMQ server is a robust and @@ -74,7 +71,6 @@ scalable implementation of an AMQP broker. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build cp %{S:2} %{_rabbit_wrapper} @@ -207,6 +203,9 @@ done rm -rf %{buildroot} %changelog +* Wed Mar 11 2015 John Eckersberg - 3.5.0-1 +- New upstream release - 3.5.0 + * Wed Feb 11 2015 John Eckersberg - 3.4.4-1 - New upstream release - 3.4.4 diff --git a/sources b/sources index 52dc262..756a4b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04c83c8e0ada4d3a604b9b4a187af976 rabbitmq-server-3.4.4.tar.gz +e599837e6d6984781a6b93b90d3b7edc rabbitmq-server-3.5.0.tar.gz