From eb28b07ea53ee4e196e8dbf869b86c1769efa734e4c50b5cf4b996e4bb82fd55 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Fri, 24 Nov 2017 10:06:46 +0000
Subject: [PATCH] Accepting request 544765 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/544765
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=218
---
 docker.changes | 6 ++++++
 docker.spec    | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docker.changes b/docker.changes
index 581c0a8..34ea1eb 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:48:08 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Tue Nov  7 16:47:01 UTC 2017 - asarai@suse.com
 
diff --git a/docker.spec b/docker.spec
index 1cfe948..00db8b5 100644
--- a/docker.spec
+++ b/docker.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
+
 %global docker_store              %{_localstatedir}/lib/docker
 %global docker_migration_testfile %{docker_store}/.suse-image-migration-v1to2-complete
 %global docker_migration_warnfile %{docker_store}/docker-update-message.txt
@@ -370,7 +375,7 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/80-%{name}.rules
 install -D -m 0640 %{SOURCE8} %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules
 
 # sysconfig file
-install -D -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.docker
+install -D -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.docker
 
 # install manpages (using the ones from the engine)
 install -d %{buildroot}%{_mandir}/man1
@@ -450,7 +455,7 @@ fi
 %{_unitdir}/%{name}.service
 %config %{_sysconfdir}/audit/rules.d/%{name}.rules
 %{_udevrulesdir}/80-%{name}.rules
-%{_localstatedir}/adm/fillup-templates/sysconfig.docker
+%{_fillupdir}/sysconfig.docker
 %{_localstatedir}/lib/docker/
 %{_mandir}/man1/docker-*.1%{ext_man}
 %{_mandir}/man1/docker.1%{ext_man}