rpms/rabbitmq-server/F-12 .cvsignore, 1.4, 1.5 rabbitmq-asroot-script-wrapper, 1.1, 1.2 rabbitmq-script-wrapper, 1.1, 1.2 rabbitmq-server.init, 1.2, 1.3 rabbitmq-server.spec, 1.5, 1.6 sources, 1.4, 1.5

Sun Feb 28 21:59:56 UTC 2010

Author: hubert

Update of /cvs/pkgs/rpms/rabbitmq-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31940

Modified Files:
	.cvsignore rabbitmq-asroot-script-wrapper 
	rabbitmq-script-wrapper rabbitmq-server.init 
	rabbitmq-server.spec sources 
Log Message:
New upstream release 1.7.2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5

--- .cvsignore	23 Nov 2009 21:57:30 -0000	1.4
+++ .cvsignore	28 Feb 2010 21:59:56 -0000	1.5
@@ -1 +1 @@
-rabbitmq-server-1.7.0.tar.gz
+rabbitmq-server-1.7.2.tar.gz


Index: rabbitmq-asroot-script-wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-12/rabbitmq-asroot-script-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rabbitmq-asroot-script-wrapper	23 Nov 2009 21:57:30 -0000	1.1
+++ rabbitmq-asroot-script-wrapper	28 Feb 2010 21:59:56 -0000	1.2
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/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
@@ -19,35 +19,27 @@
 ##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
 ##   Technologies LLC, and Rabbit Technologies Ltd.
 ##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
+##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
 ##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2009 Cohesive Financial Technologies
+##   Copyright (C) 2007-2010 Cohesive Financial Technologies
 ##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2009 Rabbit Technologies Ltd.
+##   (C) 2007-2010 Rabbit Technologies Ltd.
 ##
 ##   All Rights Reserved.
 ##
 ##   Contributor(s): ______________________________________.
 ##
 
-# Escape spaces and quotes, because shell is revolting.
-for arg in "$@" ; do
-	# Escape quotes in parameters, so that they're passed through cleanly.
-	arg=$(sed -e 's/"/\\"/g' <<-END
-		$arg
-		END
-	)
-	CMDLINE="${CMDLINE} \"${arg}\""
-done
-
 cd /var/lib/rabbitmq
 
 SCRIPT=`basename $0`
 
 if [ `id -u` = 0 ] ; then
-    /usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}
+    /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
 else
-    echo -e "\nOnly root should run ${SCRIPT}\n"
+    echo
+    echo "Only root should run ${SCRIPT}"
+    echo
     exit 1
 fi
 


Index: rabbitmq-script-wrapper
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-12/rabbitmq-script-wrapper,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rabbitmq-script-wrapper	26 May 2009 10:47:06 -0000	1.1
+++ rabbitmq-script-wrapper	28 Feb 2010 21:59:56 -0000	1.2
@@ -1,8 +1,39 @@
-#!/bin/bash
+#!/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): ______________________________________.
+##
+
 # Escape spaces and quotes, because shell is revolting.
 for arg in "$@" ; do
 	# Escape quotes in parameters, so that they're passed through cleanly.
-	arg=$(sed -e 's/"/\\"/' <<-END
+	arg=$(sed -e 's/"/\\"/g' <<-END
 		$arg
 		END
 	)
@@ -15,9 +46,13 @@ SCRIPT=`basename $0`
 
 if [ `id -u` = 0 ] ; 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} "$@"
 else
     /usr/lib/rabbitmq/bin/${SCRIPT}
-    echo -e "\nOnly root should run ${SCRIPT}\n"
+    echo
+    echo "Only root or rabbitmq should run ${SCRIPT}"
+    echo
     exit 1
 fi
 


Index: rabbitmq-server.init
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-12/rabbitmq-server.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rabbitmq-server.init	23 Nov 2009 21:57:30 -0000	1.2
+++ rabbitmq-server.init	28 Feb 2010 21:59:56 -0000	1.3
@@ -66,8 +66,6 @@ stop_rabbitmq () {
         $DAEMON stop_all > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
         RETVAL=$?
         if [ $RETVAL = 0 ] ; then
-            # Try to stop epmd if run by the rabbitmq user
-            pkill -u rabbitmq epmd || :
             [ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE
         else
             echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err


Index: rabbitmq-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-12/rabbitmq-server.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- rabbitmq-server.spec	23 Nov 2009 21:57:30 -0000	1.5
+++ rabbitmq-server.spec	28 Feb 2010 21:59:56 -0000	1.6
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name: rabbitmq-server
-Version: 1.7.0
+Version: 1.7.2
 Release: 1%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
@@ -76,9 +76,8 @@ echo '%defattr(-,root,root, -)' >> %{_bu
 %pre
 
 if [ $1 -gt 1 ]; then
-  #Upgrade - stop and remove previous instance of rabbitmq-server init.d script
+  # Upgrade - stop previous instance of rabbitmq-server init.d script
   /sbin/service rabbitmq-server stop
-  /sbin/chkconfig --del rabbitmq-server
 fi
 
 # create rabbitmq group
@@ -120,6 +119,12 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Mon Feb 15 2010 Matthew Sackman <matthew at lshift.net> 1.7.2-1
+- New Upstream Release
+
+* Fri Jan 22 2010 Matthew Sackman <matthew at lshift.net> 1.7.1-1
+- New Upstream Release
+
 * Mon Oct 5 2009 David Wragg <dpw at lshift.net> 1.7.0-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rabbitmq-server/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Nov 2009 21:57:30 -0000	1.4
+++ sources	28 Feb 2010 21:59:56 -0000	1.5
@@ -1 +1 @@
-4505ca0fd8718439bd6f5e2af2379e56  rabbitmq-server-1.7.0.tar.gz
+fb83be3b1577cdd54459012b85b7631d  rabbitmq-server-1.7.2.tar.gz

