diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-22 17:34:25 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-22 17:34:25 +0100 |
| commit | 8aff707c85ce7049d2cbb6aef920e59e9b2d3606 (patch) | |
| tree | 0e27cc4547d0d8ffe2c8a6c8bb150bda0ca3f86e /packaging/RPMS | |
| parent | 1b69e1fa1527fe559130f07b31c3002d8d634b93 (diff) | |
| parent | da265ac0ec05eef8a2fb8e3b521a7e488e7a285f (diff) | |
| download | rabbitmq-server-git-8aff707c85ce7049d2cbb6aef920e59e9b2d3606.tar.gz | |
merge default into bug21319
Diffstat (limited to 'packaging/RPMS')
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 1 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index c67d8fd6e1..be37646234 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -2,6 +2,7 @@ TARBALL_DIR=../../../dist TARBALL=$(notdir $(wildcard $(TARBALL_DIR)/rabbitmq-server-[0-9.]*.tar.gz)) COMMON_DIR=../../common VERSION=$(shell echo $(TARBALL) | sed -e 's:rabbitmq-server-\(.*\)\.tar\.gz:\1:g') +PLUGINS_DIST_DIR= TOP_DIR=$(shell pwd) #Under debian we do not want to check build dependencies, since that diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 0c5aa96a1f..57174b239a 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -55,6 +55,7 @@ mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmqctl install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-server +install -p -D -m 0755 %{_rabbit_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugin install -p -D -m 0755 %{_rabbit_server_ocf} %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server install -p -D -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/logrotate.d/rabbitmq-server @@ -85,12 +86,24 @@ if ! getent passwd rabbitmq >/dev/null; then -c "RabbitMQ messaging server" fi +chown -R rabbitmq:rabbitmq %{_rabbit_erllibdir}/plugins/ + %post /sbin/chkconfig --add %{name} if [ -f %{_sysconfdir}/rabbitmq/rabbitmq.conf ] && [ ! -f %{_sysconfdir}/rabbitmq/rabbitmq-env.conf ]; then mv %{_sysconfdir}/rabbitmq/rabbitmq.conf %{_sysconfdir}/rabbitmq/rabbitmq-env.conf fi +if [ $1 -gt 1 ]; then + # Upgrade - find the old enabled_plugins file, copy it to the new + # version and re-enable plugins + ENABLED_PLUGINS_FILE=find %{_rabbit_libdir} -name 'enabled_plugins' + if [ "x" != "x$ENABLED_PLUGINS_FILE" ]; then + cp $ENABLED_PLUGINS_FILE %{_maindir}/plugins/ + rabbitmq-plugin enable + fi +fi + %preun if [ $1 = 0 ]; then #Complete uninstall |