From 38ad2c2b418f2e6fbe3d192c509722ae9c5bd5a18487ef4ab208daf907528888 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Wed, 29 Nov 2017 16:21:27 +0000
Subject: [PATCH] Accepting request 544836 from
 home:RBrownSUSE:branches:network:cluster

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

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

diff --git a/conman.changes b/conman.changes
index b21fd12..e43b8f1 100644
--- a/conman.changes
+++ b/conman.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:54:08 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Oct  9 06:39:12 UTC 2017 - eich@suse.com
 
diff --git a/conman.spec b/conman.spec
index d954e0b..1980cb9 100644
--- a/conman.spec
+++ b/conman.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
+
 %if 0%{?suse_version} > 1140
 %define have_systemd 1
  %ifarch x86_64
@@ -112,9 +117,9 @@ mv %{buildroot}%_sysconfdir/init.d/conman.tmp %{buildroot}%_sysconfdir/init.d/co
 ln -s %{_sysconfdir}/init.d/conman %{buildroot}%{_sbindir}/rcconman
 chmod u+x %{buildroot}%{_sysconfdir}/init.d/conman
 %endif
-mkdir -p %{buildroot}/var/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
 mv %{buildroot}%{_sysconfdir}/sysconfig/conman \
-    %{buildroot}/var/adm/fillup-templates/sysconfig.conman
+    %{buildroot}%{_fillupdir}/sysconfig.conman
 for i in $(find %{buildroot}/usr/lib/conman) ; do
   if [ -f $i -a -x $i ]; then
      if ! head -1 $i | grep "^#!"; then
@@ -184,7 +189,7 @@ exit 0
 %doc THANKS
 %config(noreplace) %attr(-,%conman_u,%conman_g) %{_sysconfdir}/conman.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/conman
-%{_localstatedir}/adm/fillup-templates/sysconfig.conman
+%{_fillupdir}/sysconfig.conman
 %{_bindir}/*
 %{_sbindir}/*
 %{_prefix}/lib/conman