[rabbitmq-server/f14: 4/4] Merge branch 'master' into f14

[Peter Lemenkov]

commit 03ff125ec77e5aa1aaacdacad2d13ef8541fdefe
Merge: 0dd1776 f44ad92
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Tue Nov 8 13:41:17 2011 +0400

    Merge branch 'master' into f14

 .gitignore               |    2 +
 rabbitmq-script-wrapper  |   51 +++++-----------
 rabbitmq-server.init     |   95 ++++++++++++++++++------------
 rabbitmq-server.ocf      |  145 +++++++++++++++++++++++++---------------------
 rabbitmq-server.spec     |   29 ++++++++--
 rabbitmq-server.tmpfiles |    1 +
 sources                  |    2 +-
 7 files changed, 180 insertions(+), 145 deletions(-)
---
diff --cc rabbitmq-server.spec
index a1ded6d,905b856..b84c63c
--- 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