From 3c6a47d1363830f85b4360ef9514854851ad6f721b10ae75c3d07a7c98c21a65 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 24 Nov 2017 10:00:44 +0000
Subject: [PATCH] Accepting request 544703 from
 home:RBrownSUSE:branches:Base:System

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

OBS-URL: https://build.opensuse.org/request/show/544703
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=140
---
 syslogd.changes |  6 ++++++
 syslogd.spec    | 21 +++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/syslogd.changes b/syslogd.changes
index 6de55a5..a1ace0e 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:42:15 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Thu Apr  6 09:34:44 UTC 2017 - werner@suse.de
 
diff --git a/syslogd.spec b/syslogd.spec
index ad00b19..7ec7e76 100644
--- a/syslogd.spec
+++ b/syslogd.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
+
 %if ! %{defined _rundir}
 %define _rundir %{_localstatedir}/run
 %endif
@@ -164,26 +169,26 @@ mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}/%{_sbindir}
 mkdir -p %{buildroot}/%{_mandir}/man{5,8}
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p -m 0755 %{buildroot}/%{_rundir}/syslogd
 make install MANDIR=%{_mandir} BINDIR=%{_sbindir} DESTDIR=%{buildroot}
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
-install -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 644 %{SOURCE3} %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}
+install -m 644 %{SOURCE3} %{buildroot}%{_fillupdir}
 install -m 644 %{SOURCE5} %{buildroot}/%{_mandir}/man8/syslog.8
 install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/
 install -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/
 install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}/
 install -m 755 %{SOURCE9} %{buildroot}/%{_sbindir}/
 install -m 755 %{SOURCE10} %{buildroot}/sbin/rcsyslog
-install -m 755 %{SOURCE12} %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -m 755 %{SOURCE12} %{buildroot}%{_fillupdir}
 for sbin in klogd syslogd ; do
 	ln -sf %{_sbindir}/${sbin} %{buildroot}/sbin/${sbin}
 done
 %ifarch s390 s390x
 sed -i 's/^KERNEL_LOGLEVEL=1/KERNEL_LOGLEVEL=7/' \
-%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.klogd
+%{buildroot}%{_fillupdir}/sysconfig.klogd
 %endif
 
 %if %{defined verify_permissions}
@@ -280,7 +285,7 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/syslog.service
 
 %files
 %defattr(-,root,root)
-%{_localstatedir}/adm/fillup-templates/sysconfig.syslogd
+%{_fillupdir}/sysconfig.syslogd
 %config %verify(not mode) %{_sysconfdir}/syslog.conf
 %{_mandir}/man5/syslog.conf.5%{ext_man}
 %{_mandir}/man8/syslogd.8%{ext_man}
@@ -293,7 +298,7 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/syslog.service
 
 %files -n klogd
 %defattr(-,root,root)
-%{_localstatedir}/adm/fillup-templates/sysconfig.klogd
+%{_fillupdir}/sysconfig.klogd
 %{_unitdir}/klogd.service
 %{_mandir}/man8/klogd.8%{ext_man}
 %{_sbindir}/klogd
@@ -301,7 +306,7 @@ rm -f %{_sysconfdir}/systemd/system/multi-user.target.wants/syslog.service
 
 %files -n syslog-service
 %defattr(-,root,root)
-%{_localstatedir}/adm/fillup-templates/sysconfig.boot
+%{_fillupdir}/sysconfig.boot
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
 %{_unitdir}/klog.service
 %{_mandir}/man8/syslog.8%{ext_man}