From 7dcf53f4c7d4c8a4419876dba0c24b98c2e9e8516bbaec3bb349cad940d7ed8a Mon Sep 17 00:00:00 2001
From: Alexander Naumov <alexander_naumov@opensuse.org>
Date: Thu, 23 Nov 2017 14:55:14 +0000
Subject: [PATCH] Accepting request 544738 from
 home:RBrownSUSE:branches:network:utilities

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

OBS-URL: https://build.opensuse.org/request/show/544738
OBS-URL: https://build.opensuse.org/package/show/network:utilities/bwbar?expand=0&rev=9
---
 bwbar.changes |  6 ++++++
 bwbar.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/bwbar.changes b/bwbar.changes
index a13186e..52d5b6e 100644
--- a/bwbar.changes
+++ b/bwbar.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:45:50 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Sat Oct 26 12:24:59 UTC 2013 - p.drouand@gmail.com
 
diff --git a/bwbar.spec b/bwbar.spec
index 09999c4..b1f434e 100644
--- a/bwbar.spec
+++ b/bwbar.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package bwbar
 #
-# 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:           bwbar
 BuildRequires:  gcc-c++
 BuildRequires:  libpng-devel
@@ -68,7 +73,7 @@ CFLAGS="-Wall $RPM_OPT_FLAGS"
 %install
 install -d %buildroot%{_bindir} 
 install -m 755 bwbar %buildroot%{_bindir}
-install -m 644 -D %{SOURCE2} %buildroot/var/adm/fillup-templates/sysconfig.%{name}
+install -m 644 -D %{SOURCE2} %buildroot%{_fillupdir}/sysconfig.%{name}
 #
 %if 0%{?has_systemd}
 install -m 644 -D %{SOURCE4} %buildroot/%{_unitdir}/%name.service
@@ -111,7 +116,7 @@ ln -svf ../../etc/init.d/%{name} %buildroot/%{_sbindir}/rc%{name}
 %defattr(-, root, root)
 %doc README COPYING
 %{_bindir}/*
-/var/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 %if 0%{?has_systemd}
 %{_unitdir}/%{name}.service
 %else