Merge default into amqp_0_9_1

7 files changed, 64 insertions, 40 deletions

diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile
index 9fe91b98d2..c74d453361 100644
--- a/packaging/RPMS/Fedora/Makefile
+++ b/packaging/RPMS/Fedora/Makefile
@@ -13,12 +13,10 @@ endif
 
 ifeq "x$(RPM_OS)" "xsuse"
 REQUIRES=/sbin/chkconfig /sbin/service
-OS_DEFINES=--define '_initrddir /etc/init.d'
-RELEASE_OS=.suse
+OS_DEFINES=--define '_initrddir /etc/init.d' --define 'dist .suse'
 else
 REQUIRES=chkconfig initscripts
 OS_DEFINES=--define '_initrddir /etc/rc.d/init.d'
-RELEASE_OS=
 endif
 
 rpms:   clean server
@@ -27,7 +25,7 @@ prepare:
 	mkdir -p BUILD SOURCES SPECS SRPMS RPMS tmp
 	cp $(TOP_DIR)/$(TARBALL) SOURCES
 	cp rabbitmq-server.spec SPECS
-	sed -i 's|%%VERSION%%|$(VERSION)|;s|%%REQUIRES%%|$(REQUIRES)|;s|%%RELEASE_OS%%|$(RELEASE_OS)|' \
+	sed -i 's|%%VERSION%%|$(VERSION)|;s|%%REQUIRES%%|$(REQUIRES)|' \
 		SPECS/rabbitmq-server.spec
 
 	cp init.d SOURCES/rabbitmq-server.init
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 3c3be609ce..9e7c4bfb69 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -2,7 +2,7 @@
 
 Name: rabbitmq-server
 Version: %%VERSION%%
-Release: 1%%RELEASE_OS%%
+Release: 1%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
 Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
@@ -117,6 +117,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jun 17 2009 Matthias Radestock <matthias@lshift.net> 1.6.0-1
+- New upstream release
+
 * Tue May 19 2009 Matthias Radestock <matthias@lshift.net> 1.5.5-1
 - Maintenance release for the 1.5.x series
 
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 7c5673f77b..ac94c8a318 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.6.0-1) hardy; urgency=low
+
+  * New Upstream Release
+
+ -- Matthias Radestock <matthias@lshift.net>  Tue, 16 Jun 2009 15:02:58 +0100
+
 rabbitmq-server (1.5.5-1) hardy; urgency=low
 
   * New Upstream Release
diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control
index 216360725d..d4e2cd1763 100644
--- a/packaging/debs/Debian/debian/control
+++ b/packaging/debs/Debian/debian/control
@@ -2,12 +2,12 @@ Source: rabbitmq-server
 Section: net
 Priority: extra
 Maintainer: Tony Garnock-Jones <tonyg@rabbitmq.com>
-Build-Depends: cdbs, debhelper (>= 5), erlang-nox, erlang-dev, python-simplejson
+Build-Depends: cdbs, debhelper (>= 5), erlang-dev, python-simplejson
 Standards-Version: 3.8.0
 
 Package: rabbitmq-server
 Architecture: all
-Depends: erlang-nox, erlang-os-mon | erlang-nox (<< 1:13.b-dfsg1-1), adduser, logrotate, ${misc:Depends}
+Depends: erlang-base | erlang-base-hipe, erlang-ssl | erlang-nox (<< 1:13.b-dfsg1-1), erlang-os-mon | erlang-nox (<< 1:13.b-dfsg1-1), erlang-mnesia | erlang-nox (<< 1:13.b-dfsg1-1), adduser, logrotate, ${misc:Depends}
 Description: An AMQP server written in Erlang
  RabbitMQ is an implementation of AMQP, the emerging standard for high
  performance enterprise messaging. The RabbitMQ server is a robust and
diff --git a/packaging/macports/net/rabbitmq-server/Portfile b/packaging/macports/net/rabbitmq-server/Portfile
index 659132568f..b8096d206d 100644
--- a/packaging/macports/net/rabbitmq-server/Portfile
+++ b/packaging/macports/net/rabbitmq-server/Portfile
@@ -3,7 +3,7 @@
 
 PortSystem 1.0
 name		rabbitmq-server
-version		1.5.5
+version		1.6.0
 revision	0
 categories	net 
 maintainers	tonyg@rabbitmq.com
@@ -19,9 +19,9 @@ homepage        http://www.rabbitmq.com/
 master_sites    http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/
 
 checksums \
-    md5 3242a67885c2471b5ab62254bf024679 \
-    sha1 f4d6a01eaa2c74fa32f567fe410d21d9be1b43aa \
-    rmd160 1a1c4b97d765548028c161d1617905151ca9e040
+    md5 af3b0d868d58e5aefb4f0837b82ca010 \
+    sha1 1834c670d076fa9878223aacaa35a5a6528f1d86 \
+    rmd160 d6c9de4e1fb48c6ceb1cb5d717ca2afb5e3266fe
 
 depends_build   port:erlang port:py25-simplejson
 depends_run     port:erlang
@@ -32,6 +32,8 @@ set serverhome ${prefix}/var/lib/rabbitmq
 set logdir ${prefix}/var/log/rabbitmq
 set mnesiadbdir ${prefix}/var/lib/rabbitmq/mnesia
 set plistloc ${prefix}/etc/LaunchDaemons/org.macports.rabbitmq-server
+set sbindir ${destroot}${prefix}/lib/rabbitmq/bin
+set wrappersbin ${destroot}${prefix}/sbin
 
 use_configure   no
 
@@ -41,7 +43,7 @@ build.args      PYTHON=${prefix}/bin/python2.5
 
 destroot.destdir \
     TARGET_DIR=${destroot}${prefix}/lib/erlang/lib/rabbitmq_server-${version} \
-    SBIN_DIR=${destroot}${prefix}/sbin \
+    SBIN_DIR=${sbindir} \
     MAN_DIR=${destroot}${prefix}/share/man
 
 destroot.keepdirs \
@@ -59,32 +61,36 @@ post-destroot {
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
 
     reinplace -E "s:(/etc/rabbitmq/rabbitmq.conf):${prefix}\\1:g" \
-        ${destroot}${prefix}/sbin/rabbitmq-multi \
-        ${destroot}${prefix}/sbin/rabbitmq-server \
-        ${destroot}${prefix}/sbin/rabbitmqctl
-    reinplace -E "s:(RABBITMQ_CLUSTER_CONFIG_FILE)=/:\\1=${prefix}/:" \
-        ${destroot}${prefix}/sbin/rabbitmq-multi \
-        ${destroot}${prefix}/sbin/rabbitmq-server \
-        ${destroot}${prefix}/sbin/rabbitmqctl
-    reinplace -E "s:(RABBITMQ_LOG_BASE)=/:\\1=${prefix}/:" \
-        ${destroot}${prefix}/sbin/rabbitmq-multi \
-        ${destroot}${prefix}/sbin/rabbitmq-server \
-        ${destroot}${prefix}/sbin/rabbitmqctl
-    reinplace -E "s:(RABBITMQ_MNESIA_BASE)=/:\\1=${prefix}/:" \
-        ${destroot}${prefix}/sbin/rabbitmq-multi \
-        ${destroot}${prefix}/sbin/rabbitmq-server \
-        ${destroot}${prefix}/sbin/rabbitmqctl
-    reinplace -E "s:(RABBITMQ_PIDS_FILE)=/:\\1=${prefix}/:" \
-        ${destroot}${prefix}/sbin/rabbitmq-multi \
-        ${destroot}${prefix}/sbin/rabbitmq-server \
-        ${destroot}${prefix}/sbin/rabbitmqctl
-
-    file rename ${destroot}${prefix}/sbin/rabbitmqctl ${destroot}${prefix}/sbin/rabbitmqctl_real
-    xinstall -m 555 ${filespath}/rabbitmqctl_wrapper ${destroot}${prefix}/sbin
-    file rename ${destroot}${prefix}/sbin/rabbitmqctl_wrapper ${destroot}${prefix}/sbin/rabbitmqctl
-
-    reinplace -E "s:@PREFIX@:${prefix}:" \
-        ${destroot}${prefix}/sbin/rabbitmqctl
+        ${sbindir}/rabbitmq-multi \
+        ${sbindir}/rabbitmq-server \
+        ${sbindir}/rabbitmqctl
+    reinplace -E "s:(CLUSTER_CONFIG_FILE)=/:\\1=${prefix}/:" \
+        ${sbindir}/rabbitmq-multi \
+        ${sbindir}/rabbitmq-server \
+        ${sbindir}/rabbitmqctl
+    reinplace -E "s:(LOG_BASE)=/:\\1=${prefix}/:" \
+        ${sbindir}/rabbitmq-multi \
+        ${sbindir}/rabbitmq-server \
+        ${sbindir}/rabbitmqctl
+    reinplace -E "s:(MNESIA_BASE)=/:\\1=${prefix}/:" \
+        ${sbindir}/rabbitmq-multi \
+        ${sbindir}/rabbitmq-server \
+        ${sbindir}/rabbitmqctl
+    reinplace -E "s:(PIDS_FILE)=/:\\1=${prefix}/:" \
+        ${sbindir}/rabbitmq-multi \
+        ${sbindir}/rabbitmq-server \
+        ${sbindir}/rabbitmqctl
+
+    xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
+                ${wrappersbin}/rabbitmq-multi
+
+    reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \
+                ${wrappersbin}/rabbitmq-multi
+    reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \
+                ${wrappersbin}/rabbitmq-multi
+    file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmq-server
+    file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmqctl
+
 }
 
 pre-install {
diff --git a/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
new file mode 100644
index 0000000000..0d7118c476
--- /dev/null
+++ b/packaging/macports/net/rabbitmq-server/files/rabbitmq-script-wrapper
@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /var/lib/rabbitmq
+
+SCRIPT=`basename $0`
+
+if [ `id -u` = 0 ] ; then
+    sudo -u rabbitmq -H /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
+else
+    /usr/lib/rabbitmq/bin/${SCRIPT}
+    echo -e "\nOnly root should run ${SCRIPT}\n"
+    exit 1
+fi
+
diff --git a/packaging/macports/net/rabbitmq-server/files/rabbitmqctl_wrapper b/packaging/macports/net/rabbitmq-server/files/rabbitmqctl_wrapper
deleted file mode 100644
index 1996811eb5..0000000000
--- a/packaging/macports/net/rabbitmq-server/files/rabbitmqctl_wrapper
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec sudo -H -u rabbitmq "@PREFIX@/sbin/rabbitmqctl_real" "$@"