diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/Makefile | 9 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 8 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 20 |
3 files changed, 33 insertions, 4 deletions
diff --git a/packaging/Makefile b/packaging/Makefile index 02820bdb23..64a1243b51 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -35,6 +35,7 @@ all: packages .PHONY: packages package-deb \ package-rpm package-rpm-fedora package-rpm-suse \ + package-rpm-rhel6 package-rpm-rhel7 \ package-windows package-standalone-macosx \ package-generic-unix @@ -70,12 +71,18 @@ packages: package-deb package-rpm package-windows package-generic-unix package-deb: $(SOURCE_DIST_FILE) $(gen_verbose) $(MAKE) -C debs/Debian $(VARS) all $(DO_CLEAN) -package-rpm: package-rpm-fedora package-rpm-suse +package-rpm: package-rpm-rhel6 package-rpm-rhel7 package-rpm-suse @: package-rpm-fedora: $(SOURCE_DIST_FILE) $(gen_verbose) $(MAKE) -C RPMS/Fedora $(VARS) all $(DO_CLEAN) +package-rpm-rhel6: $(SOURCE_DIST_FILE) + $(gen_verbose) $(MAKE) -C RPMS/Fedora $(VARS) RPM_OS=rhel6 all $(DO_CLEAN) + +package-rpm-rhel7: $(SOURCE_DIST_FILE) + $(gen_verbose) $(MAKE) -C RPMS/Fedora $(VARS) RPM_OS=rhel7 all $(DO_CLEAN) + package-rpm-suse: $(SOURCE_DIST_FILE) $(gen_verbose) $(MAKE) -C RPMS/Fedora $(VARS) RPM_OS=suse all $(DO_CLEAN) diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index 0bf5467c28..11ecaff652 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -5,7 +5,7 @@ ifeq ($(SOURCE_DIST_FILE),) $(error Cannot find source archive; please specify SOURCE_DIST_FILE) endif ifneq ($(words $(SOURCE_DIST_FILE)),1) -$(error Multile source archives found; please specify SOURCE_DIST_FILE) +$(error Multiple source archives found; please specify SOURCE_DIST_FILE) endif VERSION ?= $(patsubst rabbitmq-server-%.tar.xz,%,$(notdir $(SOURCE_DIST_FILE))) @@ -34,7 +34,13 @@ else FUNCTION_LIBRARY=\# Source function library.\n. /etc/init.d/functions REQUIRES=chkconfig initscripts OS_DEFINES=--define '_initrddir /etc/rc.d/init.d' +ifeq "$(RPM_OS)" "rhel6" +SPEC_DEFINES=--define 'group_tag Development/Libraries' --define 'dist .el6' --define 'rhel 6' +else ifeq "$(RPM_OS)" "rhel7" +SPEC_DEFINES=--define 'group_tag Development/Libraries' --define '_unitdir /usr/lib/systemd/system' --define 'dist .el7' --define 'rhel 7' +else SPEC_DEFINES=--define 'group_tag Development/Libraries' +endif START_PROG=daemon endif diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index e6421c9e19..9ad05e59fb 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -118,7 +118,13 @@ fi %post %if 0%{?fedora} || 0%{?rhel} >= 7 -%systemd_post %{name}.service +# %%systemd_post %%{name}.service +# manual expansion of systemd_post as this doesn't appear to +# expand correctly on debian machines +if [ $1 -eq 1 ] ; then + # Initial installation + systemctl preset %{name}.service >/dev/null 2>&1 || : +fi /bin/systemctl daemon-reload %else /sbin/chkconfig --add %{name} @@ -131,8 +137,12 @@ chmod -R o-rwx,g-w %{_localstatedir}/lib/rabbitmq/mnesia %preun if [ $1 = 0 ]; then #Complete uninstall +%if 0%{?fedora} || 0%{?rhel} >= 7 + systemctl stop rabbitmq-server +%else /sbin/service rabbitmq-server stop /sbin/chkconfig --del rabbitmq-server +%endif # We do not remove /var/log and /var/lib directories # Leave rabbitmq user and group @@ -146,7 +156,13 @@ done %postun %if 0%{?fedora} || 0%{?rhel} >= 7 -%systemd_postun_with_restart %{name}.service +# %%systemd_postun_with_restart %%{name}.service +# manual expansion of systemd_postun_with_restart as this doesn't appear to +# expand correctly on debian machines +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi %else if [ $1 -gt 1 ]; then /sbin/service %{name} try-restart |