rpm/openscap
SHA256
1
0
Fork 0
forked from pool/openscap
Code Pull Requests Activity

Accepting request 544846 from security

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) (forwarded request 544729 from RBrownSUSE)

OBS-URL: https://build.opensuse.org/request/show/544846
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openscap?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2017-11-24 09:54:25 +00:00 committed by Git OBS Bridge
commit 2982f16f69
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openscap.changes
View File

@ -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 Tue Nov 14 14:17:28 UTC 2017 - meissner@suse.com

11
openscap.spec
View File

@ -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 sover 8
%define with_bindings 0 %define with_bindings 0
@ -187,10 +192,10 @@ make check %{?_smp_mflags} || :
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
find %{buildroot} -name "*.la" -delete 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 -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/oscap-scan 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 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/openscap
install -m 644 %{SOURCE4} $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 %files utils
%defattr(-,root,root,-) %defattr(-,root,root,-)
/var/adm/fillup-templates/sysconfig.oscap-scan %{_fillupdir}/sysconfig.oscap-scan
%doc docs/oscap-scan.cron %doc docs/oscap-scan.cron
%{_initrddir}/oscap-scan %{_initrddir}/oscap-scan
%{_mandir}/man8/* %{_mandir}/man8/*