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

mcelog.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:40:46 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Fri Jul 07 13:59:28 UTC 2017 - fschnizlein@suse.com
 

mcelog.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:           mcelog
 Version:        1.53
 Release:        0
@@ -82,8 +87,8 @@ make -e install
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
 install -m644 mcelog.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/mcelog
 
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.mcelog
+mkdir -p %{buildroot}%{_fillupdir}
+install -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.mcelog
 
 mkdir -p %{buildroot}/%{_docdir}/%{name}
 install -m 644 %{SOURCE6} %{buildroot}/%{_docdir}/%{name}/README.email_setup
@@ -114,7 +119,7 @@ ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcmcelog
 %config %{_sysconfdir}/logrotate.d/mcelog
 %dir %{_sysconfdir}/mcelog
 %config %{_sysconfdir}/mcelog/mcelog.conf
-%{_localstatedir}/adm/fillup-templates/sysconfig.mcelog
+%{_fillupdir}/sysconfig.mcelog
 %{_sysconfdir}/mcelog/*trigger
 %{_unitdir}/mcelog.service
 %{_tmpfilesdir}/mcelog.conf