Accepting request 120767 from network:messaging:amqp

version 2.8.2
 (forwarded request 116820 from matwey)

OBS-URL: https://build.opensuse.org/request/show/120767
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rabbitmq-server?expand=0&rev=3

no-nmap.patch

@@ -6,11 +6,11 @@ Index: plugins-src/rabbitmq-auth-backend-ldap/package.mk
  RELEASABLE:=true
  DEPS:=rabbitmq-server rabbitmq-erlang-client eldap-wrapper
  
--ifeq ($(shell nmap -p 389 localhost | grep '389/tcp open' > /dev/null && echo true),true)
+-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
-+# ifeq ($(shell nmap -p 389 localhost | grep '389/tcp open' > /dev/null && echo true),true)
++# 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

rabbitmq-asroot-script-wrapper

@@ -1,29 +0,0 @@
-#!/bin/sh
-##  The contents of this file are subject to the Mozilla Public License
-##  Version 1.1 (the "License"); you may not use this file except in
-##  compliance with the License. You may obtain a copy of the License
-##  at http://www.mozilla.org/MPL/
-##
-##  Software distributed under the License is distributed on an "AS IS"
-##  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-##  the License for the specific language governing rights and
-##  limitations under the License.
-##
-##  The Original Code is RabbitMQ.
-##
-##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
-##
-
-cd /var/lib/rabbitmq
-
-SCRIPT=`basename $0`
-
-if [ `id -u` = 0 ] ; then
-    /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
-else
-    echo
-    echo "Only root should run ${SCRIPT}"
-    echo
-    exit 1
-fi

rabbitmq-script-wrapper

@@ -12,7 +12,7 @@
 ##  The Original Code is RabbitMQ.
 ##
 ##  The Initial Developer of the Original Code is VMware, Inc.
-##  Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
+##  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
 ##
 
 # Escape spaces and quotes, because shell is revolting.
@@ -29,10 +29,10 @@ cd /var/lib/rabbitmq
 
 SCRIPT=`basename $0`
 
-if [ `id -u` = 0 ] ; then
+if [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then
-    su rabbitmq -s /bin/sh -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
-elif [ `id -u` = `id -u rabbitmq` ] ; then
     /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
+elif [ `id -u` = 0 ] ; then
+    @SU_RABBITMQ_SH_C@ "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"
 else
     /usr/lib/rabbitmq/bin/${SCRIPT}
     echo

rabbitmq-server-2.7.1.tar.gz

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

rabbitmq-server-2.8.2.tar.gz

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

rabbitmq-server.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 09 07:27:17 UTC 2012 - matwey.kornilov@gmail.com
+
+- Updated to 2.8.2
+
 -------------------------------------------------------------------
 Fri Apr 13 07:31:46 UTC 2012 - jblunck@opensuse.org
 

rabbitmq-server.spec

@@ -24,7 +24,7 @@
 %endif
 
 Name:           rabbitmq-server
-Version:        2.7.1
+Version:        2.8.2
 Release:        0
 Summary:        The RabbitMQ Server
 License:        MPL-1.1
@@ -34,7 +34,6 @@ Source:         http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{n
 Source1:        rabbitmq-server.init
 Source2:        rabbitmq-script-wrapper
 Source3:        rabbitmq-server.logrotate
-Source4:        rabbitmq-asroot-script-wrapper
 Source5:        rabbitmq-server.sysconfig
 Patch0:         no-nmap.patch
 Patch1:         no-remove-common.patch
@@ -94,14 +93,15 @@ This package includes the RabbitMQ AMQP language bindings for Erlang.
 %patch1
 
 %build
-make all
+make all VERSION=%{version}
 # %{?_smp_mflags}
 
 %install
 make install \
   TARGET_DIR=%{buildroot}%{_rabbit_erllibdir} \
   SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \
-  MAN_DIR=%{buildroot}%{_mandir}
+  MAN_DIR=%{buildroot}%{_mandir} \
+  VERSION=%{version}
 
 # Install init scripts
 install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/rabbitmq-server
@@ -112,16 +112,12 @@ install -p -D -m 644 %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templat
 
 # Install wrapper scripts
 %define _rabbit_wrapper %{_builddir}/`basename %{SOURCE2}`
-%define _rabbit_asroot_wrapper %{_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_asroot_wrapper}
-sed -i 's|/usr/lib/|%{_libdir}/|' %{_rabbit_asroot_wrapper}
 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-multi
+install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugins
-install -p -D -m 0755 %{_rabbit_asroot_wrapper} %{buildroot}%{_sbindir}/rabbitmq-activate-plugins
-install -p -D -m 0755 %{_rabbit_asroot_wrapper} %{buildroot}%{_sbindir}/rabbitmq-deactivate-plugins
 
 # Copy all necessary lib files etc.
 install -p -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server