diff options
| author | David Wragg <david@rabbitmq.com> | 2011-02-19 23:37:54 +0000 |
|---|---|---|
| committer | David Wragg <david@rabbitmq.com> | 2011-02-19 23:37:54 +0000 |
| commit | 67f728639d1a0923cfab0952e437d5855a062a71 (patch) | |
| tree | fb431adf36c6dd91b85242011781fcf754177b86 | |
| parent | e6b9eb1b1599c01ec553f7a1910834b7ee4fa0da (diff) | |
| download | rabbitmq-server-bug23867.tar.gz | |
Obey Fedora guidelines regarding Default-Start and Default-Stopbug23867
Fedora guidelines say that non-vital packages should omit
Default-Start and Default-Stop.
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 74a1800a..2c0f9a6c 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -12,7 +12,7 @@ ifndef RPM_OS RPM_OS=fedora endif -ifeq "x$(RPM_OS)" "xsuse" +ifeq "$(RPM_OS)" "suse" REQUIRES=/sbin/chkconfig /sbin/service OS_DEFINES=--define '_initrddir /etc/init.d' --define 'dist .suse' else @@ -34,6 +34,11 @@ prepare: -e 's|^DEFAULTS_FILE=.*$$|DEFAULTS_FILE=/etc/sysconfig/rabbitmq|' \ -e 's|^LOCK_FILE=.*$$|LOCK_FILE=/var/lock/subsys/$$NAME|' \ SOURCES/rabbitmq-server.init +ifeq "$(RPM_OS)" "fedora" +# Fedora says that only vital services should have Default-Start + sed -i -e '/^# Default-Start:/d;/^# Default-Stop:/d' \ + SOURCES/rabbitmq-server.init +endif sed -i -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \ SOURCES/rabbitmq-script-wrapper cp rabbitmq-server.logrotate SOURCES/rabbitmq-server.logrotate @@ -41,5 +46,5 @@ prepare: server: prepare rpmbuild -ba --nodeps SPECS/rabbitmq-server.spec $(DEFINES) $(OS_DEFINES) -clean: +clean: rm -rf SOURCES SPECS RPMS SRPMS BUILD tmp |