[rabbitmq-server/epel7: 4/4] fix failure to start on boot on RHEL7

[Pádraig Brady]

commit d106ca9ec80f65e3f996396b97b3b85a1796b025
Author: Pádraig Brady 
Date:   Wed Apr 9 15:04:21 2014 +0100

fix failure to start on boot on RHEL7

Also fix other RHEL7 spec file issues

Resolves: rhbz#1085418

rabbitmq-server.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index d1c3581..075a57c 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -1,6 +1,6 @@
 Name: rabbitmq-server
 Version: 3.1.5
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MPLv1.1
 Group: Development/Libraries
 Source: http://www.rabbitmq.com/releases/rabbitmq-server/v%%7Bversion%7D/%%7Bname%7D...
@@ -13,7 +13,7 @@ Source6: rabbitmq-server.service
 URL: http://www.rabbitmq.com/
 BuildArch: noarch
 BuildRequires: erlang >= R12B-3, python-simplejson, xmlto, libxslt, python, zip
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:  systemd
 %endif
 Requires: erlang >= R12B-3, logrotate
@@ -24,7 +24,7 @@ Requires(pre): shadow-utils
 #Requires(post): chkconfig initscripts
 #Requires(pre): chkconfig initscripts
 #Initscripts
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 Requires(pre): systemd
 Requires(post): systemd
 Requires(preun): systemd
@@ -99,7 +99,7 @@ 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
+%if 0%{?fedora} > 14 || 0%{?rhel} >= 7
 install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
 %endif

@@ -153,7 +153,7 @@ for ext in rel script boot ; do
     rm -f %{_rabbit_erllibdir}/ebin/rabbit.$ext
 done

-%if 0%{?fedora} > 17
+%if 0%{?fedora} > 17 || 0%{?rhel} >= 7
 %triggerun -- %{name} < 2.8.4
 # Save the current service runlevel info
 # User must manually run systemd-sysv-convert --apply opensips
@@ -177,7 +177,7 @@ done
 %{_unitdir}/%{name}.service
 %endif
 %config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
 %endif
 %dir %attr(755, rabbitmq, rabbitmq) %{_localstatedir}/run/rabbitmq
@@ -187,6 +187,9 @@ done
 rm -rf %{buildroot}

%changelog
+* Wed Apr 09 2014 Alan Pevec  - 3.1.5-6
+- Fix failure to start on boot on RHEL7 (#1085418)
+
 * Tue Apr  1 2014 Richard W.M. Jones  - 3.1.5-5
 - Fix race in systemd service startup (RHBZ#1059913).