Accepting request 583005 from home:jengelh:branches:security

- Replace old $RPM_* shell vars.

OBS-URL: https://build.opensuse.org/request/show/583005
OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=208
This commit is contained in:
Marcus Meissner 2018-03-05 15:23:38 +00:00 committed by Git OBS Bridge
parent ddbf5be776
commit da4441b12a
2 changed files with 15 additions and 10 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 5 15:11:19 UTC 2018 - jengelh@inai.de
- Replace old $RPM_* shell vars.
-------------------------------------------------------------------
Mon Mar 5 12:39:51 UTC 2018 - meissner@suse.com

View File

@ -63,7 +63,7 @@ BuildRequires: rpm-devel
BuildRequires: swig
BuildRequires: unixODBC-devel
Summary: A Set of Libraries for Integration with SCAP
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: Development/Tools/Other
BuildRequires: systemd-rpm-macros
@ -198,20 +198,20 @@ find %{buildroot} -name "*.la" -delete
# last python2 user in oscap-utils ... needs porting to python3
rm %{buildroot}/usr/bin/scap-as-rpm
mkdir -p $RPM_BUILD_ROOT%{_fillupdir}
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_fillupdir}
mkdir -p %{buildroot}/%{_fillupdir}
install -m 644 %{SOURCE2} %{buildroot}/%{_fillupdir}
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/openscap
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/openscap
install -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/openscap
install -m 644 %{SOURCE4} %{buildroot}/%{_datadir}/openscap
# specific local scan during boot script
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_unitdir}/oscap-scan.service
install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/%{_bindir}/oscap-scan
mkdir -p %{buildroot}/%{_unitdir}
install -m 644 %{SOURCE5} %{buildroot}/%{_unitdir}/oscap-scan.service
install -m 755 %{SOURCE6} %{buildroot}/%{_bindir}/oscap-scan
# create symlinks to default content
ln -s %{_datadir}/openscap/scap-yast2sec-oval.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-oval.xml
ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml $RPM_BUILD_ROOT/%{_datadir}/openscap/scap-xccdf.xml
ln -s %{_datadir}/openscap/scap-yast2sec-oval.xml %{buildroot}/%{_datadir}/openscap/scap-oval.xml
ln -s %{_datadir}/openscap/scap-yast2sec-xccdf.xml %{buildroot}/%{_datadir}/openscap/scap-xccdf.xml
%post -n libopenscap%{sover} -p /sbin/ldconfig
%post -n libopenscap_sce%{sover} -p /sbin/ldconfig