diff --git a/dmraid.changes b/dmraid.changes index d84db80..b6c2ad3 100644 --- a/dmraid.changes +++ b/dmraid.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:39:52 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Thu Oct 26 21:02:43 UTC 2017 - mwilck@suse.com diff --git a/dmraid.spec b/dmraid.spec index de48803..43896cf 100644 --- a/dmraid.spec +++ b/dmraid.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: dmraid BuildRequires: autoconf BuildRequires: automake @@ -118,8 +123,8 @@ make %install make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%_lib/libdmraid.a -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dmraid +mkdir -p $RPM_BUILD_ROOT%{_fillupdir} +install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.dmraid install -D -m 0644 %{S:6} %{buildroot}%{_unitdir}/dmraid-activation.service install -d %{buildroot}%{_tmpfilesdir} echo 'd /run/lock/dmraid 0700 root root -' > %{buildroot}%{_tmpfilesdir}/dmraid.conf @@ -153,7 +158,7 @@ chmod -x %{buildroot}%{_prefix}/include/dmraid/*h /sbin/dmevent_tool %{_mandir}/man8/* %doc LICENSE LICENSE_GPL LICENSE_LGPL README README.SUSE TODO doc/* -/var/adm/fillup-templates/sysconfig.dmraid +%{_fillupdir}/sysconfig.dmraid /%{_lib}/libdmraid-events-isw.so /%{_lib}/libdmraid.so.1.0.0.rc16-3 %dir %{_tmpfilesdir}