Accepting request 544678 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/544678
OBS-URL: https://build.opensuse.org/package/show/Base:System/cronie?expand=0&rev=159

cronie.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:39:47 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Aug 21 09:31:32 CEST 2017 - kukuk@suse.de
 

cronie.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
+
 %define cron_configs %{_sysconfdir}/pam.d/crond %{_sysconfdir}/crontab %{_sysconfdir}/cron.deny
 Name:           cronie
 Version:        1.5.1
@@ -139,8 +144,8 @@ install -m 644 contrib/anacrontab %{buildroot}%{_sysconfdir}/anacrontab
 install -c -m755 contrib/0anacron %{buildroot}%{_sysconfdir}/cron.hourly/0anacron
 mkdir -p %{buildroot}%{_localstatedir}/spool/anacron
 mv %{buildroot}%{_sbindir}/crond %{buildroot}%{_sbindir}/cron
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-cp %{SOURCE9} %{buildroot}%{_localstatedir}/adm/fillup-templates/
+mkdir -p %{buildroot}%{_fillupdir}
+cp %{SOURCE9} %{buildroot}%{_fillupdir}/
 
 touch %{buildroot}%{_localstatedir}/spool/anacron/cron.daily
 touch %{buildroot}%{_localstatedir}/spool/anacron/cron.weekly
@@ -206,7 +211,7 @@ exit 0
 %{_sbindir}/rccron
 %{_libexecdir}/cron
 %{_unitdir}/cron.service
-%{_localstatedir}/adm/fillup-templates/sysconfig.cron
+%{_fillupdir}/sysconfig.cron
 
 %files anacron
 %defattr(-,root,root,-)