Rebase to new upstream version 0.1.76

do not build ospp profile for rhel10 product

Resolves: RHEL-74239
This commit is contained in:
Vojtech Polasek 2025-02-25 13:28:08 +01:00
parent 7f958343d8
commit 9350e6fdb4
4 changed files with 30 additions and 3 deletions

1
.gitignore vendored
View File

@ -58,3 +58,4 @@
/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.76.tar.bz2

22
disable_ospp.patch Normal file
View File

@ -0,0 +1,22 @@
From 56f17c7c5c9544633ac88a54c264ab232268a40d Mon Sep 17 00:00:00 2001
From: Vojtech Polasek <vpolasek@redhat.com>
Date: Tue, 25 Feb 2025 17:18:53 +0100
Subject: prevent ospp profile from being built on rhel10 product
---
products/rhel10/profiles/ospp.profile | 1 +
1 file changed, 1 insertion(+)
diff --git a/products/rhel10/profiles/ospp.profile b/products/rhel10/profiles/ospp.profile
index 0642cbab2e..bf87808035 100644
--- a/products/rhel10/profiles/ospp.profile
+++ b/products/rhel10/profiles/ospp.profile
@@ -1,4 +1,5 @@
documentation_complete: true
+hidden: true
metadata:
version: 4.3
--
2.48.1

View File

@ -4,12 +4,13 @@
%global _vpath_builddir build
Name: scap-security-guide
Version: 0.1.74
Release: 2%{?dist}
Version: 0.1.76
Release: 1%{?dist}
Summary: Security guidance and baselines in SCAP formats
License: BSD-3-Clause
URL: https://github.com/ComplianceAsCode/content/
Source0: https://github.com/ComplianceAsCode/content/releases/download/v%{version}/scap-security-guide-%{version}.tar.bz2
Patch0: disable_ospp.patch
BuildArch: noarch
BuildRequires: libxslt
@ -98,6 +99,9 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
%endif
%changelog
* Tue Feb 25 2025 Vojtech Polasek <vpolasek@redhat.com> - 0.1.76-1
- rebase scap-security-guide to the latest upstream version 0.1.76 (RHEL-74239)
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.1.74-2
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018

View File

@ -1 +1 @@
SHA512 (scap-security-guide-0.1.74.tar.bz2) = 773cc7fb72e8d24fe9b12bf58815e051db21ee474cd0c3aebd07c2026712a89e6174c00840b1fd56195c900a541ff9e656240ee6b5a1cf3f3fe9b119cbedc30f
SHA512 (scap-security-guide-0.1.76.tar.bz2) = 27cb260eb0b2fbfd11afe2affb91624e4e2ff332e7ffe43a0c0ec2e08b5e2aa707f00e77c97fa1cbdace5549ef25cf42b34756777a568809da7d1222bd05950c