New Upstream Release - 3.1.5 (bugfix release)

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

4 files changed, 53 insertions, 41 deletions

diff --git a/.gitignore b/.gitignore
index cb8cb28..19ee106 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ rabbitmq-server-1.8.0.tar.gz
 /rabbitmq-server-3.0.4.tar.gz
 /rabbitmq-server-3.1.2.tar.gz
 /rabbitmq-server-3.1.3.tar.gz
+/rabbitmq-server-3.1.5.tar.gz
diff --git a/rabbitmq-server.init b/rabbitmq-server.init
index a7e57e8..61493a8 100644
--- a/rabbitmq-server.init
+++ b/rabbitmq-server.init
@@ -38,6 +38,8 @@ 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
@@ -58,6 +60,12 @@ start_rabbitmq () {
         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 \
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index bb6542f..85ce595 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -1,6 +1,6 @@
 Name: rabbitmq-server
-Version: 3.1.3
-Release: 2%{?dist}
+Version: 3.1.5
+Release: 1%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
 Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%{version}/%{name}-%{version}.tar.gz
@@ -13,22 +13,23 @@ Source6: rabbitmq-server.service
 URL: http://www.rabbitmq.com/
 BuildArch: noarch
 BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt, python, zip
-%if 0%{?fedora} > 17
-BuildRequires:  systemd-units
+%if 0%{?fedora}
+BuildRequires:  systemd
 %endif
 Requires: erlang >= R12B-3, logrotate
 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} > 16
-# Users and groups
-Requires(pre): shadow-utils
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+%if 0%{?fedora}
+Requires(pre): systemd
+Requires(post): systemd
+Requires(preun): systemd
 %else
+Requires(pre): initscripts
 Requires(post): chkconfig
 Requires(preun):chkconfig
 Requires(preun):initscripts
@@ -40,14 +41,14 @@ performance enterprise messaging. The RabbitMQ server is a robust and
 scalable implementation of an AMQP broker.
 
 # We want to install into /usr/lib, even on 64-bit platforms
-%define _rabbit_libdir %{_exec_prefix}/lib/rabbitmq
-%define _rabbit_erllibdir %{_rabbit_libdir}/lib/rabbitmq_server-%{version}
-%define _rabbit_wrapper %{_builddir}/`basename %{S:2}`
-%define _rabbit_server_ocf %{_builddir}/`basename %{S:4}`
-%define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
+%global _rabbit_libdir %{_exec_prefix}/lib/rabbitmq
+%global _rabbit_erllibdir %{_rabbit_libdir}/lib/rabbitmq_server-%{version}
+%global _rabbit_wrapper %{_builddir}/`basename %{S:2}`
+%global _rabbit_server_ocf %{_builddir}/`basename %{S:4}`
+%global _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
 
 
-%define _maindir %{buildroot}%{_rabbit_erllibdir}
+%global _maindir %{buildroot}%{_rabbit_erllibdir}
 
 %prep
 %setup -q
@@ -69,10 +70,10 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
 mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq
 
 #Copy all necessary lib files etc.
-%if 0%{?fedora} > 17
-install -p -D -m 0755 %{S:6} %{buildroot}%{_unitdir}/%{name}.service
-%else
+%if 0%{?el5}%{?el6}
 install -p -D -m 0755 %{S:1} %{buildroot}%{_initrddir}/rabbitmq-server
+%else
+install -p -D -m 0755 %{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
@@ -102,8 +103,12 @@ rm -rf %{buildroot}%{_rabbit_erllibdir}/LICENSE-*
 %pre
 
 if [ $1 -gt 1 ]; then
-  # Upgrade - stop previous instance of rabbitmq-server init.d script
+  # Upgrade - stop previous instance of rabbitmq-server
+%if 0%{?el5}%{?el6}
   /sbin/service rabbitmq-server stop
+%else
+  systemctl stop %{name}.service
+%endif
 fi
 
 # create rabbitmq group
@@ -118,31 +123,23 @@ if ! getent passwd rabbitmq >/dev/null; then
 fi
 
 %post
-%if 0%{?fedora} > 17
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-%else
+%if 0%{?el5}%{?el6}
 /sbin/chkconfig --add %{name}
+%else
+%systemd_post %{name}.service
 %endif
 
 %preun
-%if 0%{?fedora} > 17
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
-    /bin/systemctl stop %{name}.service > /dev/null 2>&1 || :
-fi
-%else
+# 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}
-
-  # We do not remove /var/log and /var/lib directories
-  # Leave rabbitmq user and group
 fi
+%else
+%systemd_preun %{name}.service
 %endif
 
 # Clean out plugin activation state, both on uninstall and upgrade
@@ -169,13 +166,13 @@ done
 %dir %{_sysconfdir}/rabbitmq
 %{_rabbit_erllibdir}
 %{_rabbit_libdir}/bin
-%if 0%{?fedora} > 17
-%{_unitdir}/%{name}.service
-%else
+%if 0%{?el5}%{?el6}
 %{_initrddir}/%{name}
+%else
+%{_unitdir}/%{name}.service
 %endif
 %config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
-%if 0%{?fedora} > 14
+%if 0%{?fedora}
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
 %endif
 %dir %attr(755, rabbitmq, rabbitmq) %{_localstatedir}/run/rabbitmq
@@ -185,6 +182,12 @@ done
 rm -rf %{buildroot}
 
 %changelog
+* Sat Aug 24 2013 Peter Lemenkov <lemenkov@gmail.com> - 3.1.5-1
+- New Upstream Release - 3.1.5 (bugfix release)
+
+* Wed Aug 07 2013 Peter Lemenkov <lemenkov@gmail.com> - 3.1.4-1
+- New Upstream Release - 3.1.4 (bugfix release)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index c1a9b57..23ffe6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9aad619d0c89e4018af4cf5c714d661c  rabbitmq-server-3.1.3.tar.gz
+7a412e0d9dcba1e926981a71ee41ccfc  rabbitmq-server-3.1.5.tar.gz