From 472b0f80e4e380d5b3275ba83f627453b65c528f Mon Sep 17 00:00:00 2001 From: Vojtech Polasek Date: Mon, 19 Aug 2024 15:41:47 +0200 Subject: [PATCH] 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 --- scap-security-guide.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scap-security-guide.spec b/scap-security-guide.spec index d3564c8..c9c7b35 100644 --- a/scap-security-guide.spec +++ b/scap-security-guide.spec @@ -8,7 +8,7 @@ Name: scap-security-guide Version: 0.1.74 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Security guidance and baselines in SCAP formats License: BSD-3-Clause Group: Applications/System @@ -66,7 +66,7 @@ The %{name}-rule-playbooks package contains individual ansible playbooks per rul %endif %prep -%autosetup -p1 -b1 +%setup -q -b1 -b2 %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}/guides %{buildroot}%{_docdir}/%{name} +# create symlinks for ssg--ds-1.2.xml to ssg--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 %{_datadir}/xml/scap/ssg/content %{_datadir}/%{name}/kickstart @@ -128,6 +133,10 @@ cp -r %{_builddir}/%{_static_rhel7_content}/guides %{buildroot}%{_docdir}/%{name %endif %changelog +* Mon Aug 19 2024 Vojtech Polasek - 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 - 0.1.74-2 - include RHEL 7 artifacts from the last RHEL 7 build