From f300109c3b422650d8d4fbebf5072a93aedb08cd696f645908390ae519ab72a6 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Thu, 23 Nov 2017 15:12:59 +0000
Subject: [PATCH] Accepting request 544706 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/544706
OBS-URL: https://build.opensuse.org/package/show/Base:System/issue-generator?expand=0&rev=7
---
 issue-generator.changes |  6 ++++++
 issue-generator.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/issue-generator.changes b/issue-generator.changes
index 48b0c92..584bd5a 100644
--- a/issue-generator.changes
+++ b/issue-generator.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:42:31 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed May 31 15:18:23 CEST 2017 - kukuk@suse.de
 
diff --git a/issue-generator.spec b/issue-generator.spec
index 6b92195..ac23a75 100644
--- a/issue-generator.spec
+++ b/issue-generator.spec
@@ -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:           issue-generator
 Version:        1.3
 Release:        0
@@ -44,8 +49,8 @@ make %{?_smp_mflags}
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
 ln -sf service %{buildroot}%{_sbindir}/rcissue-generator
 ln -sf service %{buildroot}%{_sbindir}/rcissue-add-ssh-keys
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_localstatedir}/adm/fillup-templates/
+mkdir -p %{buildroot}%{_fillupdir}
+install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_fillupdir}/
 %fdupes %{buildroot}%{_mandir}
 
 %pre
@@ -71,7 +76,7 @@ install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_localstatedir}/adm/
 %dir %{_prefix}/lib/tmpfiles.d
 %dir %{_prefix}/lib/udev
 %dir %{_prefix}/lib/udev/rules.d
-%{_localstatedir}/adm/fillup-templates/sysconfig.issue-generator
+%{_fillupdir}/sysconfig.issue-generator
 %{_prefix}/lib/tmpfiles.d/issue-generator.conf
 %{_prefix}/lib/udev/rules.d/90-issue-generator.rules
 %{_prefix}/lib/systemd/system/issue-add-ssh-keys.service