From a2413b1cf315f01a54d92c641e0c6e2f4abf0508260b6cedcfb4315ba59b5d41 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Fri, 24 Nov 2017 14:25:26 +0000
Subject: [PATCH] Accepting request 544684 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/544684
OBS-URL: https://build.opensuse.org/package/show/Base:System/irqbalance?expand=0&rev=68
---
 irqbalance.changes |  6 ++++++
 irqbalance.spec    | 13 +++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/irqbalance.changes b/irqbalance.changes
index 61486f5..c4affa0 100644
--- a/irqbalance.changes
+++ b/irqbalance.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:40:17 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Mar  1 16:17:07 UTC 2017 - fschnizlein@suse.com
 
diff --git a/irqbalance.spec b/irqbalance.spec
index 03b824b..180382a 100644
--- a/irqbalance.spec
+++ b/irqbalance.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package irqbalance
 #
-# Copyright (c) 2017 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:           irqbalance
 Version:        1.2.0
 Release:        0
@@ -60,8 +65,8 @@ cp %{SOURCE3} .
 %install
 %make_install
 
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/
-install -m 0644 sysconfig.irqbalance %{buildroot}%{_localstatedir}/adm/fillup-templates/
+mkdir -p %{buildroot}%{_fillupdir}/
+install -m 0644 sysconfig.irqbalance %{buildroot}%{_fillupdir}/
 sed -ie "s|EnvironmentFile=.*|EnvironmentFile=%{_sysconfdir}/sysconfig/irqbalance|g" misc/irqbalance.service
 # Remove syslog.target in systemd service file; not provided by systemd anymore
 sed -ie "s|After=syslog.target||g" misc/irqbalance.service
@@ -88,6 +93,6 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcirqbalance
 %{_sbindir}/rcirqbalance
 %{_unitdir}/irqbalance.service
 %{_mandir}/man1/irqbalance.1.gz
-%{_localstatedir}/adm/fillup-templates/sysconfig.irqbalance
+%{_fillupdir}/sysconfig.irqbalance
 
 %changelog