pool/rabbitmq-server
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 518408 from network:messaging:amqp

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/518408
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rabbitmq-server?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2017-08-24 16:55:58 +00:00 committed by Git OBS Bridge
commit 5e05eac03b
8 changed files with 91 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pull-request-20.patch
View File

@ -1,50 +0,0 @@
From 6d9a00d54425b299c682af692c9fad413d9f5da4 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Wed, 29 Mar 2017 21:44:32 +0200
Subject: [PATCH 1/2] OCF RA: Use rabbitmqctl_action wrapper for stop action
We want to use the wrapper function to call rabbitmqctl for stop, so
that we interpret correctly the exit code.
---
scripts/rabbitmq-server.ocf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/rabbitmq-server.ocf b/scripts/rabbitmq-server.ocf
index 804e654..284360b 100755
--- a/scripts/rabbitmq-server.ocf
+++ b/scripts/rabbitmq-server.ocf
@@ -299,7 +299,7 @@ rabbit_stop() {
return $OCF_SUCCESS
fi
- $RABBITMQ_CTL stop ${RABBITMQ_PID_FILE}
+ rabbitmqctl_action stop ${RABBITMQ_PID_FILE}
rc=$?
if [ "$rc" != 0 ]; then
From 3b9dcfc6653e7ae8e7ba9e2e738c9f7df30e5cce Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Wed, 29 Mar 2017 21:45:52 +0200
Subject: [PATCH 2/2] OCF RA: accept 1 as valid exit code from "rabbitmqctl
status"
It may return 1 if the server is not completely running yet, and we
don't want pacemaker to treat that as a complete unexpected error.
---
scripts/rabbitmq-server.ocf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/rabbitmq-server.ocf b/scripts/rabbitmq-server.ocf
index 284360b..bf8880d 100755
--- a/scripts/rabbitmq-server.ocf
+++ b/scripts/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
;;

196
pull-request-21.patch
View File

@ -1,196 +0,0 @@
From 0a93dca147a5efbe7e5d6c6925873d7c99cfc1a7 Mon Sep 17 00:00:00 2001
From: Alberto Planas <aplanas@gmail.com>
Date: Wed, 29 Mar 2017 22:10:53 +0200
Subject: [PATCH 1/3] OCF RA: Add new limit_nofile parameter to rabbitmq-server
OCF RA
This enables to change the limit of open files, as the default on
distributions is usually too low for rabbitmq. Default is 65535.
---
scripts/rabbitmq-server.ocf | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/scripts/rabbitmq-server.ocf b/scripts/rabbitmq-server.ocf
index 804e654..7190d65 100755
--- a/scripts/rabbitmq-server.ocf
+++ b/scripts/rabbitmq-server.ocf
@@ -30,6 +30,7 @@
## OCF_RESKEY_mnesia_base
## OCF_RESKEY_server_start_args
## OCF_RESKEY_pid_file
+## OCF_RESKEY_limit_nofile
#######################################################################
# Initialization:
@@ -44,11 +45,13 @@ OCF_RESKEY_ctl_default="/usr/sbin/rabbitmqctl"
OCF_RESKEY_nodename_default="rabbit@localhost"
OCF_RESKEY_log_base_default="/var/log/rabbitmq"
OCF_RESKEY_pid_file_default="/var/run/rabbitmq/pid"
+OCF_RESKEY_limit_nofile_default="65535"
: ${OCF_RESKEY_server=${OCF_RESKEY_server_default}}
: ${OCF_RESKEY_ctl=${OCF_RESKEY_ctl_default}}
: ${OCF_RESKEY_nodename=${OCF_RESKEY_nodename_default}}
: ${OCF_RESKEY_log_base=${OCF_RESKEY_log_base_default}}
: ${OCF_RESKEY_pid_file=${OCF_RESKEY_pid_file_default}}
+: ${OCF_RESKEY_limit_nofile=${OCF_RESKEY_limit_nofile_default}}
meta_data() {
cat <<END
@@ -144,6 +147,14 @@ Location of the file in which the pid will be stored
<content type="string" default="${OCF_RESKEY_pid_file_default}" />
</parameter>
+<parameter name="limit_nofile" unique="0" required="0">
+<longdesc lang="en">
+Soft and hard limit for NOFILE
+</longdesc>
+<shortdesc lang="en">NOFILE limit</shortdesc>
+<content type="string" default="${OCF_RESKEY_limit_nofile_default}" />
+</parameter>
+
</parameters>
<actions>
@@ -176,6 +187,7 @@ RABBITMQ_LOG_BASE=$OCF_RESKEY_log_base
RABBITMQ_MNESIA_BASE=$OCF_RESKEY_mnesia_base
RABBITMQ_SERVER_START_ARGS=$OCF_RESKEY_server_start_args
RABBITMQ_PID_FILE=$OCF_RESKEY_pid_file
+RABBITMQ_LIMIT_NOFILE=$OCF_RESKEY_limit_nofile
[ ! -z $RABBITMQ_NODENAME ] && NODENAME_ARG="-n $RABBITMQ_NODENAME"
[ ! -z $RABBITMQ_NODENAME ] && export RABBITMQ_NODENAME
@@ -204,6 +216,10 @@ export_vars() {
[ ! -z $RABBITMQ_PID_FILE ] && ensure_pid_dir && export RABBITMQ_PID_FILE
}
+set_limits() {
+ [ ! -z $RABBITMQ_LIMIT_NOFILE ] && ulimit -n $RABBITMQ_LIMIT_NOFILE
+}
+
rabbit_validate_partial() {
if [ ! -x $RABBITMQ_SERVER ]; then
ocf_log err "rabbitmq-server server $RABBITMQ_SERVER does not exist or is not executable";
@@ -276,6 +292,9 @@ rabbit_start() {
export_vars
+ # RabbitMQ requires high soft and hard limits for NOFILE
+ set_limits
+
setsid sh -c "$RABBITMQ_SERVER > ${RABBITMQ_LOG_BASE}/startup_log 2> ${RABBITMQ_LOG_BASE}/startup_err" &
# Wait for the server to come up.
From 89d65b51aa7232207c29dd3010d669d4b54901f4 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Wed, 29 Mar 2017 22:20:25 +0200
Subject: [PATCH 2/3] OCF RA: Add new limit_nofile parameter to
rabbitmq-server-ha OCF RA
This enables to change the limit of open files, as the default on
distributions is usually too low for rabbitmq. Default is 65535.
---
scripts/rabbitmq-server-ha.ocf | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index 49f3af7..2d5d660 100755
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -50,6 +50,7 @@ OCF_RESKEY_max_rabbitmqctl_timeouts_default=3
OCF_RESKEY_policy_file_default="/usr/local/sbin/set_rabbitmq_policy"
OCF_RESKEY_rmq_feature_health_check_default=true
OCF_RESKEY_rmq_feature_local_list_queues_default=true
+OCF_RESKEY_limit_nofile_default=65535
: ${HA_LOGTAG="lrmd"}
: ${HA_LOGFACILITY="daemon"}
@@ -74,6 +75,7 @@ OCF_RESKEY_rmq_feature_local_list_queues_default=true
: ${OCF_RESKEY_policy_file=${OCF_RESKEY_policy_file_default}}
: ${OCF_RESKEY_rmq_feature_health_check=${OCF_RESKEY_rmq_feature_health_check_default}}
: ${OCF_RESKEY_rmq_feature_local_list_queues=${OCF_RESKEY_rmq_feature_local_list_queues_default}}
+: ${OCF_RESKEY_limit_nofile=${OCF_RESKEY_limit_nofile_default}}
#######################################################################
@@ -332,6 +334,14 @@ stopped/demoted.
<content type="boolean" default="${OCF_RESKEY_rmq_feature_local_list_queues_default}" />
</parameter>
+<parameter name="limit_nofile" unique="0" required="0">
+<longdesc lang="en">
+Soft and hard limit for NOFILE
+</longdesc>
+<shortdesc lang="en">NOFILE limit</shortdesc>
+<content type="string" default="${OCF_RESKEY_limit_nofile_default}" />
+</parameter>
+
$EXTENDED_OCF_PARAMS
</parameters>
@@ -556,6 +566,10 @@ now() {
date -u +%s
}
+set_limits() {
+ [ ! -z $OCF_RESKEY_limit_nofile ] && ulimit -n $OCF_RESKEY_limit_nofile
+}
+
master_score() {
local LH="${LL} master_score():"
local score=$1
@@ -1166,6 +1180,9 @@ start_beam_process() {
[ -f /etc/default/rabbitmq-server ] && . /etc/default/rabbitmq-server
+ # RabbitMQ requires high soft and hard limits for NOFILE
+ set_limits
+
# run beam process
command="${OCF_RESKEY_binary} >> \"${OCF_RESKEY_log_dir}/startup_log\" 2>/dev/null"
RABBITMQ_NODE_ONLY=1 su rabbitmq -s /bin/sh -c "${command}"&
From 73080ac78348916635e45c2f62aa7d86c0765b42 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Tue, 4 Apr 2017 15:13:52 +0200
Subject: [PATCH 3/3] OCF RA: Only set limit for open files when higher than
current value
This allows to set the limit via some other way.
---
scripts/rabbitmq-server-ha.ocf | 5 ++++-
scripts/rabbitmq-server.ocf | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index 2d5d660..ea07916 100755
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -567,7 +567,10 @@ now() {
}
set_limits() {
- [ ! -z $OCF_RESKEY_limit_nofile ] && ulimit -n $OCF_RESKEY_limit_nofile
+ local current_limit=$(su $OCF_RESKEY_username -s /bin/sh -c "ulimit -n")
+ if [ ! -z $OCF_RESKEY_limit_nofile -a $OCF_RESKEY_limit_nofile -gt $current_limit ] ; then
+ ulimit -n $OCF_RESKEY_limit_nofile
+ fi
}
master_score() {
diff --git a/scripts/rabbitmq-server.ocf b/scripts/rabbitmq-server.ocf
index 7190d65..dbca06f 100755
--- a/scripts/rabbitmq-server.ocf
+++ b/scripts/rabbitmq-server.ocf
@@ -217,7 +217,10 @@ export_vars() {
}
set_limits() {
- [ ! -z $RABBITMQ_LIMIT_NOFILE ] && ulimit -n $RABBITMQ_LIMIT_NOFILE
+ local current_limit=$(su rabbitmq -s /bin/sh -c "ulimit -n")
+ if [ ! -z $RABBITMQ_LIMIT_NOFILE -a $RABBITMQ_LIMIT_NOFILE -gt $current_limit ] ; then
+ ulimit -n $RABBITMQ_LIMIT_NOFILE
+ fi
}
rabbit_validate_partial() {

74
pull-request-24.patch
View File

@ -1,74 +0,0 @@
From 525eaba13a395550b0711751c16732197ff4dc9e Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Fri, 31 Mar 2017 13:05:51 +0200
Subject: [PATCH] OCF RA: Add default_vhost parameter to rabbitmq-server-ha.ocf
This enables the cluster to focus on a vhost that is not /, in case the
most important vhost is something else.
For reference, other vhosts may exist in the cluster, but these are not
guaranteed to not suffer from any data loss. This patch doesn't address
this issue.
Closes https://github.com/rabbitmq/rabbitmq-server-release/issues/22
---
scripts/rabbitmq-server-ha.ocf | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index 49f3af7..c5c2ebf 100755
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -42,6 +42,7 @@ OCF_RESKEY_mnesia_base_default="/var/lib/rabbitmq/mnesia"
OCF_RESKEY_mnesia_schema_base_default="/var/lib/rabbitmq"
OCF_RESKEY_host_ip_default="127.0.0.1"
OCF_RESKEY_node_port_default=5672
+OCF_RESKEY_default_vhost_default="/"
OCF_RESKEY_erlang_cookie_default=false
OCF_RESKEY_erlang_cookie_file_default="/var/lib/rabbitmq/.erlang.cookie"
OCF_RESKEY_use_fqdn_default=false
@@ -67,6 +68,7 @@ OCF_RESKEY_rmq_feature_local_list_queues_default=true
: ${OCF_RESKEY_mnesia_schema_base=${OCF_RESKEY_mnesia_schema_base_default}}
: ${OCF_RESKEY_pid_file=${OCF_RESKEY_pid_file_default}}
: ${OCF_RESKEY_node_port=${OCF_RESKEY_node_port_default}}
+: ${OCF_RESKEY_default_vhost=${OCF_RESKEY_default_vhost_default}}
: ${OCF_RESKEY_erlang_cookie=${OCF_RESKEY_erlang_cookie_default}}
: ${OCF_RESKEY_erlang_cookie_file=${OCF_RESKEY_erlang_cookie_file_default}}
: ${OCF_RESKEY_use_fqdn=${OCF_RESKEY_use_fqdn_default}}
@@ -262,6 +264,18 @@ ${OCF_RESKEY_binary} should listen on this port
<content type="boolean" default="${OCF_RESKEY_node_port_default}" />
</parameter>
+<parameter name="default_vhost" unique="0" required="0">
+<longdesc lang="en">
+Default virtual host used for monitoring if a node is fully synchronized with
+the rest of the cluster. In normal operation, the resource agent will wait for
+queues from this virtual host on this node to be synchronized elsewhere before
+stopping RabbitMQ. This also means queues in other virtual hosts may not be
+fully synchronized on stop operations.
+</longdesc>
+<shortdesc lang="en">Default virtual host used for waiting for synchronization</shortdesc>
+<content type="string" default="${OCF_RESKEY_default_vhost_default}" />
+</parameter>
+
<parameter name="erlang_cookie" unique="0" required="0">
<longdesc lang="en">
Erlang cookie for clustering. If specified, will be updated at the mnesia reset
@@ -1491,7 +1505,7 @@ wait_sync() {
opt_arg="--local"
fi
- queues="${COMMAND_TIMEOUT} ${OCF_RESKEY_ctl} list_queues $opt_arg name state"
+ queues="${COMMAND_TIMEOUT} ${OCF_RESKEY_ctl} -p ${OCF_RESKEY_default_vhost} list_queues $opt_arg name state"
su_rabbit_cmd -t "${wait_time}" "sh -c \"while ${queues} | grep -q 'syncing,'; \
do sleep 2; done\""
@@ -1793,7 +1807,7 @@ node_health_check_legacy() {
local queues
local rc_queues
local timeout_queues
- queues=`su_rabbit_cmd "${OCF_RESKEY_ctl} -q list_queues memory messages consumer_utilisation"`
+ queues=`su_rabbit_cmd "${OCF_RESKEY_ctl} -q -p ${OCF_RESKEY_default_vhost} list_queues memory messages consumer_utilisation"`
rc_queues=$?
check_timeouts $rc_queues "rabbit_list_queues_timeouts" "list_queues"
timeout_queues=$?

36
pull-request-25.patch
View File

@ -1,36 +0,0 @@
From 9bd1b0a5f3e421823aaf7ef243ebe9c5d30b7855 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Fri, 31 Mar 2017 13:23:00 +0200
Subject: [PATCH] OCF RA: Don't hardcode primitive name in
rabbitmq-server-ha.ocf
We can compute the name of the primitive automatically from environment
variables, instead of hard-coding p_rabbitmq-server; this makes the
resource agent more flexible.
Closes https://github.com/rabbitmq/rabbitmq-server-release/issues/23
---
scripts/rabbitmq-server-ha.ocf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index 49f3af7..81fe19b 100755
--- a/scripts/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
@@ -89,6 +89,7 @@ OCF_RESKEY_command_timeout_default=""
: ${OCF_RESKEY_command_timeout=${OCF_RESKEY_command_timeout_default}}
TIMEOUT_ARG=$((OCF_RESKEY_CRM_meta_timeout / 6000 + 30))
COMMAND_TIMEOUT="/usr/bin/timeout ${OCF_RESKEY_command_timeout} ${TIMEOUT_ARG}"
+RESOURCE_NAME=`echo $OCF_RESOURCE_INSTANCE | cut -d ":" -f 1`
#######################################################################
@@ -654,7 +655,7 @@ get_node_start_time() {
}
get_node_master_score() {
- get_integer_node_attr $1 'master-p_rabbitmq-server'
+ get_integer_node_attr $1 "master-${RESOURCE_NAME}"
}
# Return either rabbit node name as FQDN or shortname, depends on the OCF_RESKEY_use_fqdn.

3
rabbitmq-server-3.6.11.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:849cb7109d0744954573022b6981c29213fa474360319de1845f0d84da3f3034
size 1436156

3
rabbitmq-server-3.6.6.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e
size 2471724

87
rabbitmq-server.changes
View File

@ -1,3 +1,90 @@
-------------------------------------------------------------------
Wed Aug 23 06:07:28 UTC 2017 - tbechtold@suse.com
- update to 3.6.11:
* packaging: package-rpm-suse is an alias for package-rpm-opensuse
* Makefile: Move plugins list to `plugins.mk`
* Include rabbitmq_web_mqtt into the distribution
* Log rabbitmqctl's output on failure
* Makefile: Set default `broker_version_requirements`
* packaging/windows: Allow to override `PRODUCTVERSION`
* debian/control: Revert the use of ${misc:Depends}
* packaging: Add scripts for format RabbitMQ version to match package constarints
* Commit Debian and RPM changelogs
* debian/control: Use ${misc:Depends} instead of hard-coding dependencies
* Fix HA OCF script
* Makefile: Store the plugins list in the source archive
* plugins.mk: The list is overriden by the server-release Concourse pipeline
* Makefile: Use PROJECT_DESCRIPTION in git-revisions.txt
* packaging/RPMS: Simplify the Makefile wrapping dpkg-buildpackage(1)
* Makefile: Sync exclusion list with rabbitmq-erlang-client
* OCF RA: accept 1 as valid exit code from "rabbitmqctl status"
* Ignore .envrc files
* upgrade/Makefile: Remove trailing space
* standalone/src/rabbit_release.erl: Copy `escript` directory to the archive
* packaging/standalone: Remove the source `rabbit.rel` file
* Commit .deb and .rpm change logs
* OCF RA: Don't hardcode primitive name in rabbitmq-server-ha.ocf
* Makefile: Use $(PROJECT_VERSION) instead of $(VERSION)
* debian/control: Add version restriction on erlang-dev and esl-erlang
* Commit 3.6.9 package change logs
* packaging/standalone: Fix path to the source `rabbit.rel` file
* Configure shortcuts to run as admin.
* Debian package: No need to pass $(VERSION) around in debian/rules
* Makefile: Use a recursively expanded var for `RABBITMQ_VERSION`
* Add Travis tests for Pacemaker OCF RA cluster
* Makefile: Load rabbitmq-dist.mk before rabbitmq-run.mk
* packaging/debs/Debian/Makefile: Display Erlang version *after* installing it
* packaging/debs/Debian/scripts/udpate-changelog.sh: Show syntax
* packaging/standalone: Do not use NUL-separated filenames in manifest
* packaging/standalone: Copy `start_clean.boot` to bin driectory
* packaging: rpms: Add systemd support for openSUSE
* packaging/debs/Debian/Makefile: Install build dependencies
* packaging/RPMS: Fix SAVE_CHANGELOG handling
* Makefile: Call $(MAKE), not plain `make`
* packaging/*/rabbitmq-server.service: Wait for RabbitMQ to stop in ExecStop
* packaging/debs: Use make conditionals instead of Bourne shell ones
* packaging/debs: Derive GNUPGHOME from KEYSDIR
* Add chmod g+s to /etc/rabbitmq
* packaging/standalone: Remove temporary `expand` directory
* packaging/windows: Try to compute a valid default `PRODUCTVERSION`
* Enlist OCF_RESKEY_limit_nofile_default on comment
* Re-do #21
* Makefile: Exclude `/rabbit{,mq_cli}/escript/` from the source archive
* debian/control: Try with erlang-nox 1:16.b.3-3
* packaging/standalone: Use an intermediate file to list files to archive
* Makefile: Use an intermediate file to list files to put in the source archive
* Makefile: Use echo instead of printf
* debian/control: Depend on erlang-src
* Change to 2750
* Trigger a Travis build
* packaging: Log the version of Erlang used to compile packages
* Update erlang.mk
* packaging/debs/apt-repository/distributions: Add `arm64` architecture
* Require root or rabbitmq user for rabbitmq-plugins.
* Makefile: Remove more unneeded files from the source archive
* Update rabbitmq-components.mk
* Placeholder, remove later.
* packaging/windows: Bump copyright of the installer to 2017
* Manually backport #20, #21, #24, #25 by @vuntz and @aplanas to stable
* packaging/debs: Simplify the Makefile wrapping dpkg-buildpackage(1)
* plugins.mk: Sort list alphabetically
* Add write permissions to erl
* OCF RA: Add new limit_nofile parameter to rabbitmq-server OCF RA
* packaging/debs/Debian/Makefile: Use cp(1) instead of rsync(1)
* scripts/rabbitmq-script-wrapper: Run rabbitmq-plugin as root only
* Remove.
* Add `standalone-linux-x86_64` and `standalone-freebsd-x86_64` package targets
* Makefile: Remove all targets entering the `upgrade` subdir
* OCF RA: Use rabbitmqctl_action wrapper for stop action
* README.md: Document how to build the source archive and packages
* README.md: Document how Windows' PRODUCTVERSION is computed by default
* Add chmod g+s to rpm spec
- Drop pull-request-20.patch . Applied upstream.
- Drop pull-request-21.patch . Applied upstream.
- Drop pull-request-24.patch . Applied upstream.
- Drop pull-request-25.patch . Applied upstream.
-------------------------------------------------------------------
Wed Apr 5 08:16:09 UTC 2017 - vuntz@suse.com

14
rabbitmq-server.spec
View File

@ -28,7 +28,7 @@
%define _make_args DESTDIR="%{buildroot}" PREFIX="%{_prefix}" RMQ_ROOTDIR=%{_rabbit_libdir} RMQ_ERLAPP_DIR=%{_rabbit_erllibdir} MAN_INSTALL_PATH="%{_mandir}" DOC_INSTALL_DIR=%{buildroot}/%{_docdir} VERSION=%{version} V=1
Name: rabbitmq-server
Version: 3.6.6
Version: 3.6.11
Release: 0
Summary: The RabbitMQ Server
License: MPL-1.1
@ -45,14 +45,6 @@ Source6: rabbitmq-server.service
Source7: rabbitmq-server.tmpfiles.d.conf
Source8: README.SUSE
Source9: rabbitmq.config.example
# PATCH-FIX-UPSTREAM pull-request-20.patch https://github.com/rabbitmq/rabbitmq-server-release/pull/20 -- minor fixes to rabbitmq-server.ocf
Patch0: pull-request-20.patch
# PATCH-FIX-UPSTREAM pull-request-21.patch https://github.com/rabbitmq/rabbitmq-server-release/pull/21 -- ulimit improvements for ocf files
Patch1: pull-request-21.patch
# PATCH-FIX-UPSTREAM pull-request-24.patch https://github.com/rabbitmq/rabbitmq-server-release/pull/24 -- allow specifying vhost to use in rabbitmq-server-ha.ocf
Patch2: pull-request-24.patch
# PATCH-FIX-UPSTREAM pull-request-25.patch https://github.com/rabbitmq/rabbitmq-server-release/pull/25 -- fix rabbitmq-server-ha.ocf to not hardcode resource name
Patch3: pull-request-25.patch
BuildRequires: erlang
BuildRequires: erlang-src
BuildRequires: fdupes
@ -118,10 +110,6 @@ This package includes the RabbitMQ AMQP language bindings for Erlang.
%prep
%setup -q
cp %{SOURCE8} .
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
make all %{_make_args} %{?_smp_mflags}