From 362ec74c201e9dcaa8c9d94ed624dd0fe1504f6277aada890edba37f9662a721 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:54 +0000
Subject: [PATCH] Accepting request 544657 from
 home:RBrownSUSE:branches:network

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

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

diff --git a/atftp.changes b/atftp.changes
index a956973..3dec029 100644
--- a/atftp.changes
+++ b/atftp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:38:03 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Fri Sep  8 13:01:24 UTC 2017 - pmonrealgonzalez@suse.com
 
diff --git a/atftp.spec b/atftp.spec
index 2909dba..e73de98 100644
--- a/atftp.spec
+++ b/atftp.spec
@@ -17,6 +17,11 @@
 
 
 #
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 %define pkg_version 0.7
 Name:           atftp
@@ -113,7 +118,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcatftpd
 install -D -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/atftpd
 ln -s -f ../..%{_initddir}/atftpd %{buildroot}%{_sbindir}/rcatftpd
 %endif
-install -D -m 0644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.atftpd
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.atftpd
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 mkdir -p %{buildroot}/%{_fwdefdir}
 install -m 0644 %{SOURCE4} %{buildroot}/%{_fwdefdir}/atftp
@@ -172,7 +177,7 @@ fi
 %{_initddir}/atftpd
 %endif
 %config %{_sysconfdir}/logrotate.d/%{name}
-%{_localstatedir}/adm/fillup-templates/sysconfig.atftpd
+%{_fillupdir}/sysconfig.atftpd
 %{_mandir}/man1/atftp.1.gz
 %{_mandir}/man8/atftpd.8.gz
 %{_mandir}/man8/in.tftpd.8.gz