fix build of the package

add symbolic links so that removal  datastreams with ds-1.2 in their name does not break backward compatibility

        Resolves: RHEL-53913
This commit is contained in:
Vojtech Polasek 2024-08-19 15:41:47 +02:00
parent 6c34c8256b
commit 472b0f80e4

View File

@ -8,7 +8,7 @@
Name: scap-security-guide Name: scap-security-guide
Version: 0.1.74 Version: 0.1.74
Release: 2%{?dist} Release: 3%{?dist}
Summary: Security guidance and baselines in SCAP formats Summary: Security guidance and baselines in SCAP formats
License: BSD-3-Clause License: BSD-3-Clause
Group: Applications/System Group: Applications/System
@ -66,7 +66,7 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul
%endif %endif
%prep %prep
%autosetup -p1 -b1 %setup -q -b1 -b2
%build %build
mkdir -p build mkdir -p build
@ -103,6 +103,11 @@ cp -r %{_builddir}/%{_static_rhel7_content}/usr %{buildroot}
cp -r %{_builddir}/%{_static_rhel7_content}/tables %{buildroot}%{_docdir}/%{name} cp -r %{_builddir}/%{_static_rhel7_content}/tables %{buildroot}%{_docdir}/%{name}
cp -r %{_builddir}/%{_static_rhel7_content}/guides %{buildroot}%{_docdir}/%{name} cp -r %{_builddir}/%{_static_rhel7_content}/guides %{buildroot}%{_docdir}/%{name}
# create symlinks for ssg-<product>-ds-1.2.xml to ssg-<product>-ds.xml
# this is for backward compatibility
ln -s ssg-rhel8-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-rhel8-ds-1.2.xml
ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefox-ds-1.2.xml
%files %files
%{_datadir}/xml/scap/ssg/content %{_datadir}/xml/scap/ssg/content
%{_datadir}/%{name}/kickstart %{_datadir}/%{name}/kickstart
@ -128,6 +133,10 @@ cp -r %{_builddir}/%{_static_rhel7_content}/guides %{buildroot}%{_docdir}/%{name
%endif %endif
%changelog %changelog
* Mon Aug 19 2024 Vojtech Polasek <vpolasek@redhat.com> - 0.1.74-3
- fix build
- keep firefox and rhel8 ds-1.2 files in the package in form of symbolic links to regular ds files
* Fri Aug 16 2024 Vojtech Polasek <vpolasek@redhat.com> - 0.1.74-2 * Fri Aug 16 2024 Vojtech Polasek <vpolasek@redhat.com> - 0.1.74-2
- include RHEL 7 artifacts from the last RHEL 7 build - include RHEL 7 artifacts from the last RHEL 7 build