From adaa783e6472a5155f0d3cc77ee619b74e12cbd71f4f0656853772da78eb948b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Fri, 1 Dec 2017 13:55:05 +0000
Subject: [PATCH] Accepting request 544721 from
 home:RBrownSUSE:branches:hardware

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

OBS-URL: https://build.opensuse.org/request/show/544721
OBS-URL: https://build.opensuse.org/package/show/hardware/rtasdispd?expand=0&rev=4
---
 rtasdispd.changes |  6 ++++++
 rtasdispd.spec    | 13 +++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/rtasdispd.changes b/rtasdispd.changes
index a440371..996edd5 100644
--- a/rtasdispd.changes
+++ b/rtasdispd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:43:40 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Tue Dec 10 19:29:45 UTC 2013 - dvaleev@suse.com
 
diff --git a/rtasdispd.spec b/rtasdispd.spec
index f8d109d..5560435 100644
--- a/rtasdispd.spec
+++ b/rtasdispd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rtasdispd
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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:           rtasdispd
 Version:        0.1
 Release:        0
@@ -52,10 +57,10 @@ make CFLAGS="$RPM_OPT_FLAGS -Wall"
 mv rtasdispd.1 rtasdispd.8
 make DESTDIR=$RPM_BUILD_ROOT install MANS=rtasdispd.8
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
+mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
 install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/rtasdispd
 ln -s ../../etc/init.d/rtasdispd $RPM_BUILD_ROOT/usr/sbin/rcrtasdispd
-install -m 644 %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.rtasdispd
+install -m 644 %{S:1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.rtasdispd
 
 %post
 %{fillup_and_insserv -y rtasdispd}
@@ -69,6 +74,6 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.rtasdis
 %config /etc/init.d/rtasdispd
 /usr/sbin/*
 %{_mandir}/man8/*
-/var/adm/fillup-templates/sysconfig.rtasdispd
+%{_fillupdir}/sysconfig.rtasdispd
 
 %changelog