From: Richard Brown <rbrownccb@opensuse.org>
Date: Tue, 5 Dec 2017 16:21:47 +0000 (+0100)
Subject: Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)
X-Git-Tag: v0.5.4~11^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F374%2Fhead;p=thirdparty%2Fsnapper.git

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

diff --git a/package/snapper.changes b/package/snapper.changes
index 30a31957..05bfec1f 100644
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:51:45 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Sep  6 09:53:12 CEST 2017 - aschnell@suse.com
 
diff --git a/snapper.spec.in b/snapper.spec.in
index 27b02f1d..3be04fe0 100644
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -15,6 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
 
 Name:           snapper
 Version:        @VERSION@
@@ -105,7 +109,7 @@ make %{?_smp_mflags}
 rm -f "%{buildroot}/%{_libdir}"/*.la "%{buildroot}/%{_lib}/security/pam_snapper.la"
 
 %if 0%{?suse_version}
-install -D -m 644 data/sysconfig.snapper "%{buildroot}/var/adm/fillup-templates/sysconfig.snapper"
+install -D -m 644 data/sysconfig.snapper "%{buildroot}%{_fillupdir}/sysconfig.snapper"
 %else
 install -D -m 644 data/sysconfig.snapper "%{buildroot}/etc/sysconfig/snapper"
 %endif
@@ -162,7 +166,7 @@ This package contains libsnapper, a library for filesystem snapshot management.
 %doc %{_defaultdocdir}/snapper/AUTHORS
 %doc %{_defaultdocdir}/snapper/COPYING
 %if 0%{?suse_version}
-/var/adm/fillup-templates/sysconfig.snapper
+%{_fillupdir}/sysconfig.snapper
 %else
 %config(noreplace) %{_sysconfdir}/sysconfig/snapper
 %endif