New upstream release 2.2.0

5 files changed, 17 insertions, 58 deletions

diff --git a/.gitignore b/.gitignore
index f0e8612..de899c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ rabbitmq-server-1.8.0.tar.gz
 /rabbitmq-server-2.0.0.tar.gz
 /rabbitmq-server-2.1.0.tar.gz
 /rabbitmq-server-2.1.1.tar.gz
+/rabbitmq-server-2.2.0.tar.gz
diff --git a/rabbitmq-asroot-script-wrapper b/rabbitmq-asroot-script-wrapper
deleted file mode 100644
index 693a6f0..0000000
--- a/rabbitmq-asroot-script-wrapper
+++ /dev/null
@@ -1,45 +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 Developers of the Original Code are LShift Ltd,
-##   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
-##
-##   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
-##   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
-##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
-##   Technologies LLC, and Rabbit Technologies Ltd.
-##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
-##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2010 Cohesive Financial Technologies
-##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2010 Rabbit Technologies Ltd.
-##
-##   All Rights Reserved.
-##
-##   Contributor(s): ______________________________________.
-##
-
-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
-
diff --git a/rabbitmq-script-wrapper b/rabbitmq-script-wrapper
index de6df84..e8d5d6f 100644
--- a/rabbitmq-script-wrapper
+++ b/rabbitmq-script-wrapper
@@ -49,10 +49,13 @@ if [ `id -u` = 0 ] ; then
 elif [ `id -u` = `id -u rabbitmq` ] ; then
     /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
 else
-    /usr/lib/rabbitmq/bin/${SCRIPT}
-    echo
-    echo "Only root or rabbitmq should run ${SCRIPT}"
-    echo
-    exit 1
+    /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
+    VAL=$?
+    if [ $VAL -gt 0 ] ; then
+        echo
+        echo "Only root or rabbitmq should run ${SCRIPT}"
+        echo
+    fi
+    exit $VAL
 fi
 
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index f94e48e..90ffa82 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name: rabbitmq-server
-Version: 2.1.1
+Version: 2.2.0
 Release: 1%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
@@ -9,8 +9,7 @@ Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{v
 Source1: rabbitmq-server.init
 Source2: rabbitmq-script-wrapper
 Source3: rabbitmq-server.logrotate
-Source4: rabbitmq-asroot-script-wrapper
-Source5: rabbitmq-server.ocf
+Source4: rabbitmq-server.ocf
 URL: http://www.rabbitmq.com/
 BuildArch: noarch
 BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt, python
@@ -29,8 +28,7 @@ scalable implementation of an AMQP broker.
 %define _rabbit_libdir %{_exec_prefix}/lib/rabbitmq
 %define _rabbit_erllibdir %{_rabbit_libdir}/lib/rabbitmq_server-%{version}
 %define _rabbit_wrapper %{_builddir}/`basename %{S:2}`
-%define _rabbit_asroot_wrapper %{_builddir}/`basename %{S:4}`
-%define _rabbit_server_ocf %{_builddir}/`basename %{S:5}`
+%define _rabbit_server_ocf %{_builddir}/`basename %{S:4}`
 %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
 
 
@@ -41,8 +39,7 @@ scalable implementation of an AMQP broker.
 
 %build
 cp %{S:2} %{_rabbit_wrapper}
-cp %{S:4} %{_rabbit_asroot_wrapper}
-cp %{S:5} %{_rabbit_server_ocf}
+cp %{S:4} %{_rabbit_server_ocf}
 make %{?_smp_mflags}
 
 %install
@@ -128,6 +125,9 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Sat Jan 15 2011 Hubert Plociniczak <hubert.plociniczak@gmail.com> 2.2.0-1
+- New Upstream Release
+
 * Mon Nov 1 2010 Hubert Plociniczak <hubert.plociniczak@gmail.com> 2.1.1-1
 - New Upstream Release
 
diff --git a/sources b/sources
index 88ac52e..15ceb7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2359d4b90431925e971726a6e0274bf8  rabbitmq-server-2.1.1.tar.gz
+65d0644aa4bf24398d13553b6aa6465f  rabbitmq-server-2.2.0.tar.gz