From b809f64532e73cc7a46701f253aa19d1683ade2b Mon Sep 17 00:00:00 2001
From: Gang He <ghe@suse.com>
Date: Fri, 24 Nov 2017 03:27:55 +0000
Subject: [PATCH] Accepting request 544890 from
 home:RBrownSUSE:branches:network:ha-clustering:Factory

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

OBS-URL: https://build.opensuse.org/request/show/544890
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=108
---
 ocfs2-tools.changes |  9 ++++++++-
 ocfs2-tools.spec    | 11 ++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes
index a9c01df..204db2f 100644
--- a/ocfs2-tools.changes
+++ b/ocfs2-tools.changes
@@ -1,5 +1,12 @@
 -------------------------------------------------------------------
-Fri Nov 24 10:30:00 UTC 2017 - ghe@suse.com
+Thu Nov 23 13:48:49 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+- Correct clearly invalid .changes timestamp
+
+-------------------------------------------------------------------
+Wed Nov 22 10:30:00 UTC 2017 - ghe@suse.com
 
 - Remove o2cb resource agent which is obsolete (bsc#1069099)
 
diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index e327470..c98cb74 100644
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.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
+
 Name:           ocfs2-tools
 Version:        1.8.5
 Release:        0
@@ -165,10 +170,10 @@ cd ..
 %install
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_prefix}/bin
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
 mkdir -p %{buildroot}%{_udevrulesdir}
 cp -f vendor/common/51-ocfs2.rules %{buildroot}%{_udevrulesdir}
-cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
+cp -f vendor/common/o2cb.sysconfig %{buildroot}%{_fillupdir}/sysconfig.o2cb
 
 %if %{systemd_enabled}
     mkdir -p %{buildroot}/usr/lib/systemd/system
@@ -266,7 +271,7 @@ python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}
 %endif
 
 %{_mandir}/man8/o2cb_ctl.8*
-%{_localstatedir}/adm/fillup-templates/sysconfig.o2cb
+%{_fillupdir}/sysconfig.o2cb
 %{_mandir}/man7/o2cb.7.gz
 %{_mandir}/man8/o2cb.8.gz