From cc316203ad15b6d2e146d41fc160ea4fb61f9b2d51cfc56449d60343a75f5396 Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Thu, 23 Nov 2017 22:54:39 +0000
Subject: [PATCH] Accepting request 544679 from
 home:RBrownSUSE:branches:Base:System

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

OBS-URL: https://build.opensuse.org/request/show/544679
OBS-URL: https://build.opensuse.org/package/show/Base:System/dmraid?expand=0&rev=55
---
 dmraid.changes |  6 ++++++
 dmraid.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dmraid.changes b/dmraid.changes
index d84db80..b6c2ad3 100644
--- a/dmraid.changes
+++ b/dmraid.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:39:52 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Thu Oct 26 21:02:43 UTC 2017 - mwilck@suse.com
 
diff --git a/dmraid.spec b/dmraid.spec
index de48803..43896cf 100644
--- a/dmraid.spec
+++ b/dmraid.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
+
 Name:           dmraid
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -118,8 +123,8 @@ make
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT/%_lib/libdmraid.a
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dmraid
+mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.dmraid
 install -D -m 0644 %{S:6} %{buildroot}%{_unitdir}/dmraid-activation.service
 install -d %{buildroot}%{_tmpfilesdir}
 echo 'd /run/lock/dmraid 0700 root root -' > %{buildroot}%{_tmpfilesdir}/dmraid.conf
@@ -153,7 +158,7 @@ chmod -x %{buildroot}%{_prefix}/include/dmraid/*h
 /sbin/dmevent_tool
 %{_mandir}/man8/*
 %doc LICENSE LICENSE_GPL LICENSE_LGPL README README.SUSE TODO doc/*
-/var/adm/fillup-templates/sysconfig.dmraid
+%{_fillupdir}/sysconfig.dmraid
 /%{_lib}/libdmraid-events-isw.so
 /%{_lib}/libdmraid.so.1.0.0.rc16-3
 %dir %{_tmpfilesdir}