Merge branch 'c8' into a8

This commit is contained in:
Andrew Lukoshko 2024-12-26 07:16:43 +00:00
commit 61b0b0b20d
3 changed files with 9 additions and 6 deletions

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
SOURCES/scap-security-guide-0.1.52-2.el7_9-rhel6.tar.bz2
SOURCES/scap-security-guide-0.1.73-1.el7_9-rhel7.tar.bz2
SOURCES/scap-security-guide-0.1.74.tar.bz2
SOURCES/scap-security-guide-0.1.75.tar.bz2

View File

@ -1,3 +1,3 @@
b22b45d29ad5a97020516230a6ef3140a91d050a SOURCES/scap-security-guide-0.1.52-2.el7_9-rhel6.tar.bz2
17274daaa588330aa4df9a4d8df5ef448e40a696 SOURCES/scap-security-guide-0.1.73-1.el7_9-rhel7.tar.bz2
31288700eb6b3cd31d181592238babd8752d5074 SOURCES/scap-security-guide-0.1.74.tar.bz2
96a8823bf638cd2c656deb431686f74da8084694 SOURCES/scap-security-guide-0.1.75.tar.bz2

View File

@ -7,8 +7,8 @@
# global _default_patch_fuzz 2 # Normally shouldn't be needed as patches should apply cleanly
Name: scap-security-guide
Version: 0.1.74
Release: 3%{?dist}.alma.1
Version: 0.1.75
Release: 1%{?dist}.alma.1
Summary: Security guidance and baselines in SCAP formats
License: BSD-3-Clause
Group: Applications/System
@ -26,7 +26,6 @@ Patch1001: 0001-Add-AlmaLinux-8-support.patch
BuildArch: noarch
BuildRequires: libxslt
BuildRequires: expat
BuildRequires: openscap-scanner >= 1.2.5
BuildRequires: cmake >= 2.8
BuildRequires: python3-devel
@ -130,9 +129,13 @@ ln -s ssg-firefox-ds.xml %{buildroot}%{_datadir}/xml/scap/ssg/content/ssg-firefo
%{_datadir}/%{name}/ansible/rule_playbooks
%changelog
* Wed Aug 28 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 0.1.74-3.alma.1
* Thu Dec 26 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 0.1.75-1.alma.1
- Add AlmaLinux support
* Fri Nov 15 2024 Matthew Burket <mburket@redhat.com> - 0.1.75-1
- Rebase scap-security-guide to the latest upstream version (RHEL-66153)
- detection of Grub2 kernel command line arguments has been enhanced to cover more use cases (RHEL-53365)
* 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