diff --git a/rabbitmq-server.init b/rabbitmq-server.init
deleted file mode 100644
index 61493a8..0000000
--- a/rabbitmq-server.init
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/bin/sh
-#
-# rabbitmq-server RabbitMQ broker
-#
-# chkconfig: - 80 05
-# description: Enable AMQP service provided by RabbitMQ
-#
-
-### BEGIN INIT INFO
-# Provides: rabbitmq-server
-# Required-Start: $remote_fs $network
-# Required-Stop: $remote_fs $network
-# Description: RabbitMQ broker
-# Short-Description: Enable AMQP service provided by RabbitMQ broker
-### END INIT INFO
-
-# Source function library.
-. /etc/init.d/functions
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-NAME=rabbitmq-server
-DAEMON=/usr/sbin/${NAME}
-CONTROL=/usr/sbin/rabbitmqctl
-DESC=rabbitmq-server
-USER=rabbitmq
-ROTATE_SUFFIX=
-INIT_LOG_DIR=/var/log/rabbitmq
-PID_FILE=/var/run/rabbitmq/pid
-
-START_PROG="daemon"
-LOCK_FILE=/var/lock/subsys/$NAME
-
-test -x $DAEMON || exit 0
-test -x $CONTROL || exit 0
-
-RETVAL=0
-set -e
-
-[ -f /etc/default/${NAME} ] && . /etc/default/${NAME}
-
-[ -f /etc/sysconfig/${NAME} ] && . /etc/sysconfig/${NAME}
-
-ensure_pid_dir () {
- PID_DIR=`dirname ${PID_FILE}`
- if [ ! -d ${PID_DIR} ] ; then
- mkdir -p ${PID_DIR}
- chown -R ${USER}:${USER} ${PID_DIR}
- chmod 755 ${PID_DIR}
- fi
-}
-
-remove_pid () {
- rm -f ${PID_FILE}
- rmdir `dirname ${PID_FILE}` || :
-}
-
-start_rabbitmq () {
- status_rabbitmq quiet
- if [ $RETVAL = 0 ] ; then
- echo RabbitMQ is currently running
- else
- RETVAL=0
- # RABBIT_NOFILES_LIMIT from /etc/sysconfig/rabbitmq-server is not handled
- # automatically
- if [ "$RABBITMQ_NOFILES_LIMIT" ]; then
- ulimit -n $RABBITMQ_NOFILES_LIMIT
- fi
-
- ensure_pid_dir
- set +e
- RABBITMQ_PID_FILE=$PID_FILE $START_PROG $DAEMON \
- > "${INIT_LOG_DIR}/startup_log" \
- 2> "${INIT_LOG_DIR}/startup_err" \
- 0<&- &
- $CONTROL wait $PID_FILE >/dev/null 2>&1
- RETVAL=$?
- set -e
- case "$RETVAL" in
- 0)
- echo SUCCESS
- if [ -n "$LOCK_FILE" ] ; then
- touch $LOCK_FILE
- fi
- ;;
- *)
- remove_pid
- echo FAILED - check ${INIT_LOG_DIR}/startup_\{log, _err\}
- RETVAL=1
- ;;
- esac
- fi
-}
-
-stop_rabbitmq () {
- status_rabbitmq quiet
- if [ $RETVAL = 0 ] ; then
- set +e
- $CONTROL stop ${PID_FILE} > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
- RETVAL=$?
- set -e
- if [ $RETVAL = 0 ] ; then
- remove_pid
- if [ -n "$LOCK_FILE" ] ; then
- rm -f $LOCK_FILE
- fi
- else
- echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err
- fi
- else
- echo RabbitMQ is not running
- RETVAL=0
- fi
-}
-
-status_rabbitmq() {
- set +e
- if [ "$1" != "quiet" ] ; then
- $CONTROL status 2>&1
- else
- $CONTROL status > /dev/null 2>&1
- fi
- if [ $? != 0 ] ; then
- RETVAL=3
- fi
- set -e
-}
-
-rotate_logs_rabbitmq() {
- set +e
- $CONTROL rotate_logs ${ROTATE_SUFFIX}
- if [ $? != 0 ] ; then
- RETVAL=1
- fi
- set -e
-}
-
-restart_running_rabbitmq () {
- status_rabbitmq quiet
- if [ $RETVAL = 0 ] ; then
- restart_rabbitmq
- else
- echo RabbitMQ is not runnning
- RETVAL=0
- fi
-}
-
-restart_rabbitmq() {
- stop_rabbitmq
- start_rabbitmq
-}
-
-case "$1" in
- start)
- echo -n "Starting $DESC: "
- start_rabbitmq
- echo "$NAME."
- ;;
- stop)
- echo -n "Stopping $DESC: "
- stop_rabbitmq
- echo "$NAME."
- ;;
- status)
- status_rabbitmq
- ;;
- rotate-logs)
- echo -n "Rotating log files for $DESC: "
- rotate_logs_rabbitmq
- ;;
- force-reload|reload|restart)
- echo -n "Restarting $DESC: "
- restart_rabbitmq
- echo "$NAME."
- ;;
- try-restart)
- echo -n "Restarting $DESC: "
- restart_running_rabbitmq
- echo "$NAME."
- ;;
- *)
- echo "Usage: $0 {start|stop|status|rotate-logs|restart|condrestart|try-restart|reload|force-reload}" >&2
- RETVAL=1
- ;;
-esac
-
-exit $RETVAL
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index e267b16..8edec81 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -7,7 +7,6 @@ Release: 1%{?dist}
License: MPLv1.1
Group: Development/Libraries
Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
-Source1: rabbitmq-server.init
# curl -O https://raw.githubusercontent.com/rabbitmq/rabbitmq-server/231e90c/scripts/rabbitmq-script-wrapper
# sed -i -e "s, @STDOUT_STDERR_REDIRECTION@,,g" rabbitmq-script-wrapper
# sed -i -e "s,@SU_RABBITMQ_SH_C@,su rabbitmq -s /bin/sh -c,g" rabbitmq-script-wrapper
@@ -20,9 +19,7 @@ Source6: rabbitmq-server.service
URL: http://www.rabbitmq.com/
BuildArch: noarch
BuildRequires: erlang >= %{erlang_minver}, python-simplejson, xmlto, libxslt, python, zip
-%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: systemd
-%endif
Requires: logrotate
Requires: erlang-erts%{?_isa} >= %{erlang_minver}
Requires: erlang-kernel%{?_isa} >= %{erlang_minver}
@@ -36,23 +33,12 @@ Requires: erlang-ssl%{?_isa} >= %{erlang_minver}
Requires: erlang-stdlib%{?_isa} >= %{erlang_minver}
Requires: erlang-tools%{?_isa} >= %{erlang_minver}
Requires: erlang-xmerl%{?_isa} >= %{erlang_minver}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%{_arch}-root
Summary: The RabbitMQ server
# Users and groups
Requires(pre): shadow-utils
-#Requires(post): chkconfig initscripts
-#Requires(pre): chkconfig initscripts
-#Initscripts
-%if 0%{?fedora} || 0%{?rhel} >= 7
Requires(pre): systemd
Requires(post): systemd
Requires(preun): systemd
-%else
-Requires(pre): initscripts
-Requires(post): chkconfig
-Requires(preun):chkconfig
-Requires(preun):initscripts
-%endif
# https://bugzilla.redhat.com/show_bug.cgi?id=998682
# https://bugzilla.redhat.com/show_bug.cgi?id=1032595#c8
@@ -70,22 +56,22 @@ scalable implementation of an AMQP broker.
%global _rabbit_server_ocf %{_builddir}/%{buildsubdir}/`basename %{S:4}`
%global _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
-
%global _maindir %{buildroot}%{_rabbit_erllibdir}
+
%prep
%setup -q
%patch1 -p1 -b .ephemeral
+
%build
cp %{S:2} %{_rabbit_wrapper}
cp %{S:4} %{_rabbit_server_ocf}
#USE_SPECS="true" USE_PROPER_QC="false" make %{?_smp_mflags}
make %{?_smp_mflags}
-%install
-rm -rf %{buildroot}
+%install
make install TARGET_DIR=%{_maindir} \
SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \
MAN_DIR=%{buildroot}%{_mandir} \
@@ -95,11 +81,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
#Copy all necessary lib files etc.
-%if 0%{?el5}%{?el6}
-install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server
-%else
install -p -D -m 0644 %{S:6} %{buildroot}%{_unitdir}/%{name}.service
-%endif
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-plugins
@@ -120,14 +102,12 @@ echo '%defattr(-,root,root, -)' >> %{_builddir}/%{buildsubdir}/%{name}.files
| sed -e 's/^\.//' >> %{_builddir}/%{buildsubdir}/%{name}.files)
install -d %{buildroot}%{_localstatedir}/run/rabbitmq
-%if 0%{?fedora} > 14 || 0%{?rhel} >= 7
install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
-%endif
rm -rf %{buildroot}%{_rabbit_erllibdir}/LICENSE-*
-%pre
+%pre
# create rabbitmq group
if ! getent group rabbitmq >/dev/null; then
groupadd -r rabbitmq
@@ -141,25 +121,14 @@ fi
%post
-%if 0%{?el5}%{?el6}
-/sbin/chkconfig --add %{name}
-%else
%systemd_post %{name}.service
/bin/systemctl daemon-reload
-%endif
+
%preun
# We do not remove /var/log and /var/lib directories
# Leave rabbitmq user and group
-%if 0%{?el5}%{?el6}
-if [ $1 = 0 ]; then
- #Complete uninstall
- /sbin/service %{name} stop > /dev/null 2>&1
- /sbin/chkconfig --del %{name}
-fi
-%else
%systemd_preun %{name}.service
-%endif
# Clean out plugin activation state, both on uninstall and upgrade
rm -rf %{_plugins_state_dir}
@@ -167,14 +136,9 @@ for ext in rel script boot ; do
rm -f %{_rabbit_erllibdir}/ebin/rabbit.$ext
done
+
%postun
-%if 0%{?el5}%{?el6}
-if [ $1 -gt 1 ]; then
- /sbin/service %{name} try-restart
-fi
-%else
%systemd_postun_with_restart %{name}.service
-%endif
%if 0%{?fedora} > 17 || 0%{?rhel} >= 7
%triggerun -- %{name} < 2.8.4
@@ -188,6 +152,7 @@ fi
/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
%endif
+
%files -f %{name}.files
%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/lib/rabbitmq
%attr(0750, rabbitmq, rabbitmq) %dir %{_localstatedir}/log/rabbitmq
@@ -195,22 +160,18 @@ fi
%config(noreplace) %{_sysconfdir}/rabbitmq/rabbitmq.config
%{_rabbit_erllibdir}
%{_rabbit_libdir}/bin
-%if 0%{?el5}%{?el6}
-%{_initrddir}/%{name}
-%else
%{_unitdir}/%{name}.service
-%endif
%config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
-%if 0%{?fedora} || 0%{?rhel} >= 7
%config(noreplace) %{_prefix}/lib/tmpfiles.d/%{name}.conf
-%endif
%dir %attr(755, rabbitmq, rabbitmq) %{_localstatedir}/run/rabbitmq
%doc LICENSE LICENSE-*
-%clean
-rm -rf %{buildroot}
%changelog
+* Wed Dec 16 2015 Peter Lemenkov <lemenkov@gmail.com> - 3.5.7-2
+- Kill support for SysV branches (no more love for EL5 and EL6). Well keep
+ scriptlet for upgrading from pre-2.8.4 versions for a while.
+
* Tue Dec 15 2015 Peter Lemenkov <lemenkov@gmail.com> - 3.5.7-1
- New upstream release - 3.5.7