diff --git a/openscap.changes b/openscap.changes index 7b2155d..f2d4e55 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:44:24 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Tue Nov 14 14:17:28 UTC 2017 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 29c50eb..5ea2221 100644 --- a/openscap.spec +++ b/openscap.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 sover 8 %define with_bindings 0 @@ -187,10 +192,10 @@ make check %{?_smp_mflags} || : make install DESTDIR=%{buildroot} find %{buildroot} -name "*.la" -delete -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates +mkdir -p $RPM_BUILD_ROOT%{_fillupdir} install -d -m 755 $RPM_BUILD_ROOT%{_initrddir} install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/oscap-scan -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_fillupdir} install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/openscap install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/openscap @@ -290,7 +295,7 @@ ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/ %files utils %defattr(-,root,root,-) -/var/adm/fillup-templates/sysconfig.oscap-scan +%{_fillupdir}/sysconfig.oscap-scan %doc docs/oscap-scan.cron %{_initrddir}/oscap-scan %{_mandir}/man8/*