diff options
| author | Simon MacMullen <simon@lshift.net> | 2010-05-10 16:39:01 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@lshift.net> | 2010-05-10 16:39:01 +0100 |
| commit | 4e12216ebecd90afc97ddfea31b6f4394e8bbfbd (patch) | |
| tree | dccaff833b0ba6a39618b4b21a47930aa61fc398 /packaging | |
| parent | 6324169a1041a601712c8dd12a36bfaed56b3cd4 (diff) | |
| parent | b57ebc9d104ab2db4b44b874181db1cf21ecd2c2 (diff) | |
| download | rabbitmq-server-git-4e12216ebecd90afc97ddfea31b6f4394e8bbfbd.tar.gz | |
Merge up to a8da11d231ff from default to amqp_0_9_1. This causes
testConnectionQueueSameNode to fail due to a race in recovering
exclusive queues (bug 22695). We'll need a fix from default, so
leaving as is for the time being.
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 4 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/control | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index b052d889b3..6926261f79 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -13,8 +13,8 @@ Source4: rabbitmq-asroot-script-wrapper Source5: rabbitmq-server.ocf URL: http://www.rabbitmq.com/ BuildArch: noarch -BuildRequires: erlang, python-simplejson, xmlto, libxslt -Requires: erlang, logrotate +BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt +Requires: erlang >= R12B-3, logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_arch}-root Summary: The RabbitMQ server Requires(post): %%REQUIRES%% diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control index 479c356829..a44f49a0e0 100644 --- a/packaging/debs/Debian/debian/control +++ b/packaging/debs/Debian/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.8.0 Package: rabbitmq-server Architecture: all -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} +Depends: erlang-base (>= 1:12.b.3) | erlang-base-hipe (>= 1:12.b.3), 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 |