From 6c34c8256b392f215cc029051549616431c7d4db Mon Sep 17 00:00:00 2001
From: Vojtech Polasek <vpolasek@redhat.com>
Date: Fri, 16 Aug 2024 11:25:11 +0200
Subject: [PATCH] include RHEL 7 artifacts in the package

    Resolves: RHEL-53913
---
 .gitignore               |  1 +
 scap-security-guide.spec | 14 +++++++++++++-
 sources                  |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 17ed41c..43b06f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ SOURCES/scap-security-guide-0.1.66.tar.bz2
 /scap-security-guide-0.1.72.tar.bz2
 /scap-security-guide-0.1.73.tar.bz2
 /scap-security-guide-0.1.74.tar.bz2
+/scap-security-guide-0.1.73-1.el7_9-rhel7.tar.bz2
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index 003caef..d3564c8 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -1,12 +1,14 @@
 # Base name of static rhel6 content tarball
 %global _static_rhel6_content %{name}-0.1.52-2.el7_9-rhel6
+# Base name of static rhel7 content tarball
+%global _static_rhel7_content %{name}-0.1.73-1.el7_9-rhel7
 # https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
 %global _vpath_builddir build
 # global _default_patch_fuzz 2  # Normally shouldn't be needed as patches should apply cleanly
 
 Name:		scap-security-guide
 Version:	0.1.74
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Security guidance and baselines in SCAP formats
 License:	BSD-3-Clause
 Group:		Applications/System
@@ -14,6 +16,8 @@ URL:		https://github.com/ComplianceAsCode/content/
 Source0:	https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2
 # Include tarball with last released rhel6 content
 Source1:	%{_static_rhel6_content}.tar.bz2
+# Include tarball with last released rhel7 content
+Source2:	%{_static_rhel7_content}.tar.bz2
 
 BuildArch:	noarch
 
@@ -94,6 +98,11 @@ cp -r %{_builddir}/%{_static_rhel6_content}/usr %{buildroot}
 cp -r %{_builddir}/%{_static_rhel6_content}/tables %{buildroot}%{_docdir}/%{name}
 cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name}
 
+# Manually install pre-built rhel7 content
+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}
+
 %files
 %{_datadir}/xml/scap/ssg/content
 %{_datadir}/%{name}/kickstart
@@ -119,6 +128,9 @@ cp -r %{_builddir}/%{_static_rhel6_content}/guides %{buildroot}%{_docdir}/%{name
 %endif
 
 %changelog
+* Fri Aug 16 2024 Vojtech Polasek <vpolasek@redhat.com> - 0.1.74-2
+- include RHEL 7 artifacts from the last RHEL 7 build
+
 * Fri Aug 09 2024 Matthew Burket <mburket@redhat.com> - 0.1.74-1
 - Rebase to a new upstream release 0.1.74 (RHEL-53913)
 - Improve Rsyslog rules to support RainerScript syntax (RHEL-1816)
diff --git a/sources b/sources
index a8298d2..30e9624 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (scap-security-guide-0.1.52-2.el7_9-rhel6.tar.bz2) = c12b1210a7829578d2b32c22950a9f93913ae4981efb31304aea04d43791eb86c75bb5cdc4ceb35741bcb00306db44a5734a03bd0578f1d255917d590e840260
 SHA512 (scap-security-guide-0.1.74.tar.bz2) = 773cc7fb72e8d24fe9b12bf58815e051db21ee474cd0c3aebd07c2026712a89e6174c00840b1fd56195c900a541ff9e656240ee6b5a1cf3f3fe9b119cbedc30f
+SHA512 (scap-security-guide-0.1.73-1.el7_9-rhel7.tar.bz2) = 36321a8ba03bcdb41e592a8dfdd8126e7717effeab5fa65b56db1125d2b62bf79ed0940b819f1ea1e080d1960553b1f28e317e019b725147b980e07b96700860