From 917a28130b99e8b4618a412d2a19dbe384caa9cdc84c03bbb735131c25697245 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 23 Nov 2017 15:13:02 +0000
Subject: [PATCH] Accepting request 544736 from
 home:RBrownSUSE:branches:devel:tools:scm:svn

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

OBS-URL: https://build.opensuse.org/request/show/544736
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=258
---
 subversion.changes |  6 ++++++
 subversion.spec    | 11 ++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/subversion.changes b/subversion.changes
index 288511b..2fb875e 100644
--- a/subversion.changes
+++ b/subversion.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:45:36 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Nov  1 18:01:15 UTC 2017 - mpluskal@suse.com
 
diff --git a/subversion.spec b/subversion.spec
index b2f7700..1d34a3f 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -18,6 +18,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %define svngroup svn
 %define svnuser svn
 %{!?_tmpfilesdir: %global _tmpfilesdir %{_libexecdir}/tmpfiles.d }
@@ -359,8 +364,8 @@ rm -rf %{buildroot}%{_bindir}/svn-tools
 ln -sf svnbench %{buildroot}%{_bindir}/svn-bench
 
 mkdir -p %{buildroot}%{_prefix}/sbin
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 644 -D %{SOURCE10} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.svnserve
+mkdir -p %{buildroot}%{_fillupdir}
+install -m 644 -D %{SOURCE10} %{buildroot}%{_fillupdir}/sysconfig.svnserve
 install -m 644 -D %{SOURCE12} %{buildroot}/%{_fwdefdir}/svnserve
 install -d -m 0755 %{buildroot}/srv/svn
 
@@ -456,7 +461,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/svnserve.conf
 %dir %{_docdir}/%{name}/*
 %{_docdir}/%{name}
 %{_sbindir}/rcsvnserve
-%{_localstatedir}/adm/fillup-templates/sysconfig.svnserve
+%{_fillupdir}/sysconfig.svnserve
 %dir %attr(755,%{svnuser},%{svngroup}) /srv/svn
 %config %{_fwdefdir}/*
 %{_unitdir}/svnserve.service