diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-22 17:49:02 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2011-09-22 17:49:02 +0100 |
| commit | 4b27b8f67ac821d797924e39029176b6ea82f700 (patch) | |
| tree | cd10680b039cf9a07b6d8eb706c05bfeef1921e1 /packaging/RPMS | |
| parent | 8aff707c85ce7049d2cbb6aef920e59e9b2d3606 (diff) | |
| download | rabbitmq-server-git-4b27b8f67ac821d797924e39029176b6ea82f700.tar.gz | |
fix packaging bits
Diffstat (limited to 'packaging/RPMS')
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 1 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 14 |
2 files changed, 2 insertions, 13 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index be37646234..c67d8fd6e1 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -2,7 +2,6 @@ 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 57174b239a..d86a85a778 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -55,7 +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_wrapper} %{buildroot}%{_sbindir}/rabbitmq-plugins 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 @@ -86,7 +86,7 @@ if ! getent passwd rabbitmq >/dev/null; then -c "RabbitMQ messaging server" fi -chown -R rabbitmq:rabbitmq %{_rabbit_erllibdir}/plugins/ +chmod -w %{_rabbit_erllibdir}/plugins/ %post /sbin/chkconfig --add %{name} @@ -94,16 +94,6 @@ if [ -f %{_sysconfdir}/rabbitmq/rabbitmq.conf ] && [ ! -f %{_sysconfdir}/rabbitm 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 |