From 56a05a9da96b7527ae787a408a19406b6a82c03d907cd0d7d26a6e15ade40abc Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 27 Nov 2017 10:04:29 +0000
Subject: [PATCH] Accepting request 544831 from
 home:RBrownSUSE:branches:network:messaging:amqp

Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544831
OBS-URL: https://build.opensuse.org/package/show/network:messaging:amqp/rabbitmq-server?expand=0&rev=82
---
 rabbitmq-server.changes | 6 ++++++
 rabbitmq-server.spec    | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index f5d2c18..424fe4e 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:53:44 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Thu Nov 16 16:09:24 UTC 2017 - dmueller@suse.com
 
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index fa3600b..5c8202e 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %bcond_without split_plugins
 
 %define _rabbit_erllibdir %{_libdir}/rabbitmq/lib/rabbitmq_server-%{version}
@@ -126,8 +131,8 @@ install -p -D -m 0644 %{SOURCE7} %{buildroot}/usr/lib/tmpfiles.d/rabbitmq-server
 # Install init scripts
 install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/rabbitmq-server
 ln -sf %{_initddir}/rabbitmq-server %{buildroot}%{_sbindir}/rcrabbitmq-server
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/
-install -p -D -m 644 %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.rabbitmq-server
+mkdir -p %{buildroot}%{_fillupdir}/
+install -p -D -m 644 %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.rabbitmq-server
 %endif
 
 # Install wrapper scripts