From d1b669b9aa8047abeecc610f1004e82012f5f7aa6a16ea33139595dcb63bc13c Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Thu, 23 Nov 2017 16:40:08 +0000
Subject: [PATCH] Accepting request 544732 from
 home:RBrownSUSE:branches:filesystems

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

OBS-URL: https://build.opensuse.org/request/show/544732
OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsmaintenance?expand=0&rev=24
---
 btrfsmaintenance.changes |  6 ++++++
 btrfsmaintenance.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/btrfsmaintenance.changes b/btrfsmaintenance.changes
index b45c1d5..709a1fc 100644
--- a/btrfsmaintenance.changes
+++ b/btrfsmaintenance.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:44:40 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Fri Nov 10 22:12:08 UTC 2017 - antoine.belvire@opensuse.org
 
diff --git a/btrfsmaintenance.spec b/btrfsmaintenance.spec
index 4162c43..5c0cf68 100644
--- a/btrfsmaintenance.spec
+++ b/btrfsmaintenance.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:           btrfsmaintenance
 Version:        0.3.1
 Release:        0
@@ -78,8 +83,8 @@ ln -s %{_datadir}/%{name}/btrfsmaintenance-refresh-cron.sh %{buildroot}%{_syscon
 install -m 755 -d %{buildroot}/usr/lib/zypp/plugins/commit
 install -m 755 -D btrfs-defrag-plugin.py %{buildroot}/usr/lib/zypp/plugins/commit
 
-install -m 755 -d %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 644 -D sysconfig.btrfsmaintenance %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 755 -d %{buildroot}%{_fillupdir}
+install -m 644 -D sysconfig.btrfsmaintenance %{buildroot}%{_fillupdir}
 
 %post
 %{fillup_only btrfsmaintenance}
@@ -117,7 +122,7 @@ fi
 %files
 %defattr(-,root,root)
 %doc COPYING README.md
-%{_localstatedir}/adm/fillup-templates/sysconfig.btrfsmaintenance
+%{_fillupdir}/sysconfig.btrfsmaintenance
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %dir /usr/lib/zypp/