From 43e7a701272574694c879e2561cb19b5d1405dd1676dab354239feedb5526add Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 24 Nov 2017 07:06:40 +0000
Subject: [PATCH] Accepting request 544707 from
 home:RBrownSUSE:branches:utilities

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

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

diff --git a/actkbd.changes b/actkbd.changes
index ddb02e0..f797756 100644
--- a/actkbd.changes
+++ b/actkbd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:42:35 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Feb 16 15:25:27 UTC 2015 - tchvatal@suse.com
 
diff --git a/actkbd.spec b/actkbd.spec
index f1eb303..3d4188c 100644
--- a/actkbd.spec
+++ b/actkbd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package actkbd
 #
-# Copyright (c) 2014 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:           actkbd
 Version:        0.2.8
 Release:        0
@@ -51,7 +56,7 @@ mkdir -p %{buildroot}%{_sbindir}/
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcactkbd
 
 install -Dm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/actkbd.conf
-install -Dm 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.actkbd
+install -Dm 644 %{SOURCE3} %{buildroot}%{_fillupdir}/sysconfig.actkbd
 
 install -Dm 755 actkbd %{buildroot}%{_sbindir}/actkbd
 
@@ -75,7 +80,7 @@ install -dm 644 samples %{buildroot}%{_docdir}/%{name}/samples
 %defattr(-,root,root)
 %doc README NEWS FAQ AUTHORS
 %config %{_sysconfdir}/actkbd.conf
-%{_localstatedir}/adm/fillup-templates/*
+%{_fillupdir}/*
 %{_sbindir}/actkbd
 %{_unitdir}/actkbd.service
 %{_sbindir}/rcactkbd