Accepting request 297970 from network:messaging:amqp
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/297970 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rabbitmq-server?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
e02d29fe3c
@ -2,15 +2,18 @@ Index: plugins-src/rabbitmq-auth-backend-ldap/package.mk
|
||||
===================================================================
|
||||
--- plugins-src/rabbitmq-auth-backend-ldap/package.mk.orig
|
||||
+++ plugins-src/rabbitmq-auth-backend-ldap/package.mk
|
||||
@@ -1,7 +1,7 @@
|
||||
@@ -1,9 +1,9 @@
|
||||
RELEASABLE:=true
|
||||
DEPS:=rabbitmq-server rabbitmq-erlang-client eldap-wrapper
|
||||
|
||||
-ifeq ($(shell nc -z localhost 389 && echo true),true)
|
||||
-WITH_BROKER_TEST_COMMANDS:=eunit:test(rabbit_auth_backend_ldap_test,[verbose])
|
||||
-WITH_BROKER_TEST_COMMANDS:=eunit:test([rabbit_auth_backend_ldap_unit_test,rabbit_auth_backend_ldap_test],[verbose])
|
||||
-WITH_BROKER_TEST_CONFIG:=$(PACKAGE_DIR)/etc/rabbit-test
|
||||
-else
|
||||
+#ifeq ($(shell nc -z localhost 389 && echo true),true)
|
||||
+#WITH_BROKER_TEST_COMMANDS:=eunit:test([rabbit_auth_backend_ldap_unit_test,rabbit_auth_backend_ldap_test],[verbose])
|
||||
+#WITH_BROKER_TEST_CONFIG:=$(PACKAGE_DIR)/etc/rabbit-test
|
||||
+#else
|
||||
$(warning Not running LDAP tests; no LDAP server found on localhost)
|
||||
-endif
|
||||
+# ifeq ($(shell nc -z localhost 389 && echo true),true)
|
||||
+# WITH_BROKER_TEST_COMMANDS:=eunit:test(rabbit_auth_backend_ldap_test,[verbose])
|
||||
+# WITH_BROKER_TEST_CONFIG:=$(PACKAGE_DIR)/etc/rabbit-test
|
||||
+# endif
|
||||
+#endif
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
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
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a6cb2d68f99054c87cc7daa2d3857f85a2adfc582f6ab8538f2605031751b5d5
|
||||
size 3656510
|
||||
3
rabbitmq-server-3.5.1.tar.gz
Normal file
3
rabbitmq-server-3.5.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bda603b37ba933eab2b7fd9cdb9b138b793ad030cd5cb7824bc794754b76ca0d
|
||||
size 3723354
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 12 01:56:58 UTC 2015 - mrueckert@suse.de
|
||||
|
||||
- update to 3.5.1
|
||||
This release adds support for priority queues which were available
|
||||
as a plugin before. Performance is improved; in particular messages
|
||||
smaller than configurable size are embedded in the queue index to
|
||||
reduce I/O and memory consumption. Stability of clustering and
|
||||
autoheal partition handling is improved as well. A new
|
||||
pause_if_all_down partition handling mode is added. The management
|
||||
web UI now shows many more I/O statistics.
|
||||
|
||||
This release also corrects a number of defects in the broker and
|
||||
plugins, as well as introducing many smaller new features and
|
||||
improvements.
|
||||
|
||||
* see https://www.rabbitmq.com/release-notes/README-3.5.1.txt
|
||||
* see https://www.rabbitmq.com/release-notes/README-3.5.0.txt
|
||||
* see https://www.rabbitmq.com/release-notes/README-3.4.4.txt
|
||||
|
||||
- instead of patching the ocf provider after copying: patch it
|
||||
right away and drop the ocf-fixes.patch.
|
||||
- refresh no-nmap.patch to apply cleanly again
|
||||
- create rcrabbitmq-server for the systemd case
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 21 16:12:13 UTC 2015 - dmueller@suse.com
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package rabbitmq-server
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -24,7 +24,7 @@
|
||||
%endif
|
||||
|
||||
Name: rabbitmq-server
|
||||
Version: 3.4.3
|
||||
Version: 3.5.1
|
||||
Release: 0
|
||||
Summary: The RabbitMQ Server
|
||||
License: MPL-1.1
|
||||
@ -41,7 +41,6 @@ Source6: rabbitmq-server.service
|
||||
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
|
||||
@ -106,7 +105,7 @@ This package includes the RabbitMQ AMQP language bindings for Erlang.
|
||||
%patch1
|
||||
%define _rabbit_server_ocf `basename %{SOURCE4}`
|
||||
cp %{SOURCE4} %{_rabbit_server_ocf}
|
||||
%patch10 -p1
|
||||
#patch10 -p1
|
||||
|
||||
%build
|
||||
make all VERSION=%{version}
|
||||
@ -120,12 +119,13 @@ make install \
|
||||
DOC_INSTALL_DIR=%{buildroot}/%{_docdir} \
|
||||
VERSION=%{version}
|
||||
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
%if 0%{?have_systemd}
|
||||
install -p -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service
|
||||
ln -s -f %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
|
||||
%else
|
||||
# Install init scripts
|
||||
install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/rabbitmq-server
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
ln -sf %{_initddir}/rabbitmq-server %{buildroot}%{_sbindir}/rcrabbitmq-server
|
||||
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/
|
||||
install -p -D -m 644 %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.rabbitmq-server
|
||||
@ -221,9 +221,9 @@ systemd-tmpfiles --create --clean /usr/lib/tmpfiles.d/rabbitmq-server.conf
|
||||
%{_unitdir}/%{name}.service
|
||||
/usr/lib/tmpfiles.d/rabbitmq-server.conf
|
||||
%else
|
||||
%{_sbindir}/rcrabbitmq-server
|
||||
%{_initddir}/rabbitmq-server
|
||||
%endif
|
||||
%{_sbindir}/rcrabbitmq-server
|
||||
%dir /usr/lib/ocf
|
||||
%dir /usr/lib/ocf/resource.d
|
||||
%dir /usr/lib/ocf/resource.d/rabbitmq
|
||||
|
||||
Loading…
Reference in New Issue
Block a user