summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert@lshift.net>2009-02-20 15:43:24 +0000
committerHubert Plociniczak <hubert@lshift.net>2009-02-20 15:43:24 +0000
commit7630ef4c944f78cfd31e47d4a48ba3670c7eaa32 (patch)
tree0e66338ff38503e8832acf7dac6ff0e725678140
parent13344e17280377bb45350b8beadba41f7361a2d1 (diff)
parent788ccd582164e41460e9b246c3480c68d475e583 (diff)
downloadrabbitmq-server-7630ef4c944f78cfd31e47d4a48ba3670c7eaa32.tar.gz
Merge bug20352 into default
-rw-r--r--packaging/RPMS/Fedora/init.d8
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec1
2 files changed, 3 insertions, 6 deletions
diff --git a/packaging/RPMS/Fedora/init.d b/packaging/RPMS/Fedora/init.d
index 9223ae1a..eba2db99 100644
--- a/packaging/RPMS/Fedora/init.d
+++ b/packaging/RPMS/Fedora/init.d
@@ -2,16 +2,14 @@
#
# rabbitmq-server RabbitMQ broker
#
-#chkconfig: 2345 80 05
-#description: Enable AMQP service provided by RabbitMQ
+# chkconfig: - 80 05
+# description: Enable AMQP service provided by RabbitMQ
#
### BEGIN INIT INFO
-# Provides: rabbitmq
+# Provides: rabbitmq-server
# Required-Start: $remote_fs $network
# Required-Stop: $remote_fs $network
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
# Description: RabbitMQ broker
# Short-Description: Enable AMQP service provided by RabbitMQ broker
### END INIT INFO
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 17daeada..051ff188 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -96,7 +96,6 @@ chown -R rabbitmq:rabbitmq /var/lib/rabbitmq
chown -R rabbitmq:rabbitmq /var/log/rabbitmq
/sbin/chkconfig --add %{name}
-/sbin/service rabbitmq-server start
%preun
if [ $1 = 0 ]; then