[rabbitmq-server/el6: 2/2] Merge branch 'master' into el6

[Peter Lemenkov]

commit aec8065c1fb44a8ff926cbb40aac5f5d602f1f15
Merge: 323de94 f44ad92
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Nov 8 13:42:20 2011 +0400

    Merge branch 'master' into el6

 .gitignore               |    1 +
 rabbitmq-script-wrapper  |   51 +++++-----------
 rabbitmq-server.init     |   95 ++++++++++++++++++------------
 rabbitmq-server.ocf      |  145 +++++++++++++++++++++++++---------------------
 rabbitmq-server.spec     |   19 +++++-
 rabbitmq-server.tmpfiles |    1 +
 sources                  |    2 +-
 7 files changed, 171 insertions(+), 143 deletions(-)
---
diff --cc rabbitmq-server.spec
index c256b8d,905b856..c2b58d8
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@@ -10,9 -10,10 +10,10 @@@ Source1: rabbitmq-server.ini
  Source2: rabbitmq-script-wrapper
  Source3: rabbitmq-server.logrotate
  Source4: rabbitmq-server.ocf
+ Source5: rabbitmq-server.tmpfiles
  URL: http://www.rabbitmq.com/
  BuildArch: noarch
 -BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt, python
 +BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt
  Requires: erlang >= R12B-3, logrotate
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_arch}-root
  Summary: The RabbitMQ server