From 631008cbdfc34834fcea1063958063137d2639b1 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Jul 17 2016 15:49:58 +0000
Subject: Fixed rabbitmq-server script to use RABBITMQ_SERVER_ERL_ARGS everywhere


Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

diff --git a/rabbitmq-server-0006-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch b/rabbitmq-server-0006-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch
new file mode 100644
index 0000000..efbff82
--- /dev/null
+++ b/rabbitmq-server-0006-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch
@@ -0,0 +1,18 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sun, 17 Jul 2016 18:42:06 +0300
+Subject: [PATCH] rabbit_prelaunch must use RABBITMQ_SERVER_ERL_ARGS
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
+index 7433731..25fff3a 100755
+--- a/scripts/rabbitmq-server
++++ b/scripts/rabbitmq-server
+@@ -71,6 +71,7 @@ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \
+     -boot "${CLEAN_BOOT_FILE}" \
+     -noinput \
+     -hidden \
++    ${RABBITMQ_SERVER_ERL_ARGS} \
+     -s rabbit_prelaunch \
+     ${RABBITMQ_NAME_TYPE} rabbitmqprelaunch$$ \
+     -extra "${RABBITMQ_NODENAME}"
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index c1c4b72..b557758 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -5,7 +5,7 @@
 
 Name: rabbitmq-server
 Version: 3.6.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
 Source0: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.xz
@@ -21,6 +21,7 @@ Patch2: rabbitmq-server-0002-Add-systemd-notification-support.patch
 Patch3: rabbitmq-server-0003-Revert-Distinct-exit-codes-for-CLI-utilities.patch
 Patch4: rabbitmq-server-0004-Allow-guest-login-from-non-loopback-connections.patch
 Patch5: rabbitmq-server-0005-Avoid-RPC-roundtrips-in-list-commands.patch
+Patch6: rabbitmq-server-0006-rabbit_prelaunch-must-use-RABBITMQ_SERVER_ERL_ARGS.patch
 Patch101: rabbitmq-common-0001-Avoid-RPC-roundtrips-while-listing-items.patch
 Patch102: rabbitmq-common-0002-Use-proto_dist-from-command-line.patch
 
@@ -61,6 +62,7 @@ scalable implementation of an AMQP broker.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 cd deps/rabbit_common
 %patch101 -p1
@@ -181,6 +183,9 @@ done
 
 
 %changelog
+* Sun Jul 17 2016 Peter Lemenkov <lemenkov@gmail.com> - 3.6.3-4
+- Fixed rabbitmq-server script to use RABBITMQ_SERVER_ERL_ARGS everywhere
+
 * Sun Jul 17 2016 Peter Lemenkov <lemenkov@gmail.com> - 3.6.3-3
 - Improve proto_dist usage patch