From 9714edda008d1f1af932c7b53f791992fa89affa65d2de6170bcf95bfe66c71c Mon Sep 17 00:00:00 2001
From: Yan Gao <ygao@suse.com>
Date: Wed, 29 Nov 2017 17:29:11 +0000
Subject: [PATCH] Accepting request 546501 from
 home:yan_gao:branches:network:ha-clustering:Factory:Test

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

OBS-URL: https://build.opensuse.org/request/show/546501
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=280
---
 pacemaker.changes |  6 ++++++
 pacemaker.spec    | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pacemaker.changes b/pacemaker.changes
index ed772a3..3738dcc 100644
--- a/pacemaker.changes
+++ b/pacemaker.changes
@@ -20,6 +20,12 @@ Wed Nov 29 12:05:00 UTC 2017 - ygao@suse.com
 - tools: enable new crm_resource --cleanup/--refresh behavior
 - Upstream version cs: 53a3fe14b15b087bbde9ccb524d11d0a413cc6e9
 
+-------------------------------------------------------------------
+Thu Nov 23 13:48:52 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Nov 20 16:20:53 UTC 2017 - ygao@suse.co
 
diff --git a/pacemaker.spec b/pacemaker.spec
index dd6b30d..5d5ded8 100644
--- a/pacemaker.spec
+++ b/pacemaker.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
+
 # Globals and defines to control package behavior (configure these as desired)
 
 ## User and group to use for nonprivileged services
@@ -356,9 +361,9 @@ make %{?_smp_mflags} all
 %install
 %make_install
 
-install -d -m755 %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 644 mcp/pacemaker.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.pacemaker
-install -m 644 tools/crm_mon.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.crm_mon
+install -d -m755 %{buildroot}%{_fillupdir}
+install -m 644 mcp/pacemaker.sysconfig %{buildroot}%{_fillupdir}/sysconfig.pacemaker
+install -m 644 tools/crm_mon.sysconfig %{buildroot}%{_fillupdir}/sysconfig.crm_mon
 
 # Scripts that should be executable
 chmod a+x %{buildroot}/%{_datadir}/pacemaker/tests/cts/CTSlab.py
@@ -560,8 +565,8 @@ fi
 %dir %{_libexecdir}/ocf/resource.d
 %{_libexecdir}/ocf/resource.d/pacemaker
 
-%config(noreplace) %{_localstatedir}/adm/fillup-templates/sysconfig.pacemaker
-%config(noreplace) %{_localstatedir}/adm/fillup-templates/sysconfig.crm_mon
+%config(noreplace) %{_fillupdir}/sysconfig.pacemaker
+%config(noreplace) %{_fillupdir}/sysconfig.crm_mon
 %{_mandir}/man7/*
 %exclude %{_mandir}/man7/crmd.*
 %exclude %{_mandir}/man7/pengine.*