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

[Hubert Plociniczak]

commit c7b33a3c6584ed0f0c6a4c31b9888df2f71ffcc1
Merge: 5ab2a1b 359031b
Author: Hubert Plociniczak <hubert.plociniczak at gmail.com>
Date:   Sun Jan 16 01:58:50 2011 +0100

    Merge branch 'master' into f13

 .gitignore                     |    1 +
 rabbitmq-asroot-script-wrapper |   45 ----------------------------------------
 rabbitmq-script-wrapper        |   13 +++++++----
 rabbitmq-server.spec           |   14 ++++++------
 sources                        |    2 +-
 5 files changed, 17 insertions(+), 58 deletions(-)
---
diff --cc rabbitmq-server.spec
index 798f994,90ffa82..e3960ac
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@@ -9,11 -9,10 +9,10 @@@ Source: http://www.rabbitmq.com/release
  Source1: rabbitmq-server.init
  Source2: rabbitmq-script-wrapper
  Source3: rabbitmq-server.logrotate
- Source4: rabbitmq-asroot-script-wrapper
- Source5: rabbitmq-server.ocf
+ Source4: rabbitmq-server.ocf
  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
@@@ -29,10 -28,10 +28,9 @@@ scalable implementation of an AMQP brok
  %define _rabbit_libdir %{_exec_prefix}/lib/rabbitmq
  %define _rabbit_erllibdir %{_rabbit_libdir}/lib/rabbitmq_server-%{version}
  %define _rabbit_wrapper %{_builddir}/`basename %{S:2}`
- %define _rabbit_asroot_wrapper %{_builddir}/`basename %{S:4}`
- %define _rabbit_server_ocf %{_builddir}/`basename %{S:5}`
+ %define _rabbit_server_ocf %{_builddir}/`basename %{S:4}`
  %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
  
 -
  %define _maindir %{buildroot}%{_rabbit_erllibdir}
  
  %prep