From 8e706de1236d403200f7a670d988b125932a46f1b5075602f21ddab72798db35 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Fri, 24 Nov 2017 10:06:55 +0000
Subject: [PATCH] Accepting request 544764 from
 home:RBrownSUSE:branches:Virtualization:containers

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

OBS-URL: https://build.opensuse.org/request/show/544764
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=64
---
 containerd.changes | 6 ++++++
 containerd.spec    | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/containerd.changes b/containerd.changes
index 0d91515..f71ab95 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:48:04 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Thu Oct 26 19:27:48 UTC 2017 - asarai@suse.com
 
diff --git a/containerd.spec b/containerd.spec
index b1b442a..b014e4e 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -17,6 +17,11 @@
 # nodebuginfo
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define go_tool go
 %define GO_BUILD_FLAGS -buildmode=pie
 
@@ -113,7 +118,7 @@ install -D -m755 ctr-%{version} %{buildroot}/%{_sbindir}/%{name}-ctr
 install -D -m644 %SOURCE1 %{buildroot}/%{_unitdir}/%{name}.service
 install -D -m644 %SOURCE2 %{buildroot}/%{_unitdir}/%{name}.socket
 ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rccontainerd
-install -D -m644 %SOURCE3 %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
+install -D -m644 %SOURCE3 %{buildroot}%{_fillupdir}/sysconfig.%{name}
 
 install -d -m755 %{buildroot}/usr/src/containerd/
 cp -ar $HOME/go/src/github.com/containerd/containerd/* %{buildroot}/usr/src/containerd/
@@ -140,7 +145,7 @@ cp -ar $HOME/go/src/github.com/containerd/containerd/* %{buildroot}/usr/src/cont
 %{_sbindir}/containerd-shim
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}.socket
-/var/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 %{_sbindir}/rccontainerd
 
 %files ctr