From 2ee7cb1a5e7203fe2260b386f33b444d29569bcd7401f2ddcaf91a8ad954d76d Mon Sep 17 00:00:00 2001
From: Hillwood Yang <hillwoodroc@gmail.com>
Date: Fri, 24 Nov 2017 07:41:32 +0000
Subject: [PATCH] Accepting request 544788 from home:RBrownSUSE:branches:M17N

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

OBS-URL: https://build.opensuse.org/request/show/544788
OBS-URL: https://build.opensuse.org/package/show/M17N/fwnn?expand=0&rev=21
---
 fwnn.changes | 6 ++++++
 fwnn.spec    | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/fwnn.changes b/fwnn.changes
index 7f2f176..2bca265 100644
--- a/fwnn.changes
+++ b/fwnn.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:49:55 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Jun 13 22:33:24 UTC 2016 - jengelh@inai.de
 
diff --git a/fwnn.spec b/fwnn.spec
index 15ea94d..3cc8e8f 100644
--- a/fwnn.spec
+++ b/fwnn.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fwnn
 #
-# Copyright (c) 2016 SUSE LINUX 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
+
 %define base_version 1.1.1
 %define alpha_version a023
 Name:           fwnn
@@ -268,7 +273,7 @@ done
 #----------------------------------------------------------------------
 # Make sure directories for of boot script installation exist:
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
 mkdir -p %{buildroot}%{_sbindir}
 #----------------------------------------------------------------------
 # Install boot scripts: