Accepting request 544646 from home:RBrownSUSE:branches:systemsmanagement

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

OBS-URL: https://build.opensuse.org/request/show/544646
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/freeipmi?expand=0&rev=91

freeipmi.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:37:11 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Oct 18 14:54:53 UTC 2017 - alarrosa@suse.com
 

freeipmi.spec

@@ -17,6 +17,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %if 0%{?suse_version} > 1140 || 0%{?fedora_version} > 14
 %define has_systemd 1
 %else
@@ -238,8 +243,8 @@ echo freeipmi > %{buildroot}%{_localstatedir}/lib/freeipmi/ipckey
 rm -rf %{buildroot}/%{_libdir}/*.la
 
 %if 0%{?suse_version}
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
-mv %{buildroot}%{_sysconfdir}/sysconfig/bmc-watchdog %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.bmc-watchdog
+mv %{buildroot}%{_sysconfdir}/sysconfig/bmc-watchdog %{buildroot}%{_fillupdir}/sysconfig.bmc-watchdog
 %endif
 
 %if 0%{?suse_version} > 1010
@@ -555,7 +560,7 @@ fi
 %config(noreplace) %{_initddir}/bmc-watchdog
 %endif
 %if 0%{?suse_version}
-%attr(0444,root,root) %config(noreplace) %{_localstatedir}/adm/fillup-templates/sysconfig.bmc-watchdog
+%attr(0444,root,root) %config(noreplace) %{_fillupdir}/sysconfig.bmc-watchdog
 %else
 %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/bmc-watchdog
 %endif