diff --git a/SOURCES/openscap-1.3.3-almalinux.patch b/SOURCES/openscap-1.3.3-almalinux.patch new file mode 100644 index 0000000..2e284d3 --- /dev/null +++ b/SOURCES/openscap-1.3.3-almalinux.patch @@ -0,0 +1,70 @@ +diff -Naur openscap-1.3.3.orig/cpe/openscap-cpe-dict.xml openscap-1.3.3.alma/cpe/openscap-cpe-dict.xml +--- openscap-1.3.3.orig/cpe/openscap-cpe-dict.xml 2020-04-30 11:50:09.000000000 +0300 ++++ openscap-1.3.3.alma/cpe/openscap-cpe-dict.xml 2021-03-18 05:46:55.852269989 +0300 +@@ -37,6 +37,10 @@ + Oracle Linux 8 + oval:org.open-scap.cpe.ol:def:8 + ++ ++ AlmaLinux 8 ++ oval:org.open-scap.cpe.almalinux:def:8 ++ + + Community Enterprise Operating System 5 + oval:org.open-scap.cpe.rhel:def:1005 +diff -Naur openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml openscap-1.3.3.alma/cpe/openscap-cpe-oval.xml +--- openscap-1.3.3.orig/cpe/openscap-cpe-oval.xml 2020-04-30 11:50:09.000000000 +0300 ++++ openscap-1.3.3.alma/cpe/openscap-cpe-oval.xml 2021-03-22 13:12:12.069413537 +0300 +@@ -133,6 +133,19 @@ + + + ++ ++ ++ AlmaLinux 8 ++ ++ AlmaLinux 8 ++ ++ ++ The operating system installed on the system is AlmaLinux 8 ++ ++ ++ ++ ++ + + + Community Enterprise Operating System 5 +@@ -828,6 +841,11 @@ + + + ++ ++ ++ ++ + + +@@ -1165,6 +1183,9 @@ + + oraclelinux-release + ++ ++ almalinux-release ++ + + HKEY_LOCAL_MACHINE + SOFTWARE\Microsoft\Windows NT\CurrentVersion +@@ -1233,6 +1254,10 @@ + ^oraclelinux-release + ^8 + ++ ++ ^almalinux-release ++ ^8 ++ + + ^16$ + diff --git a/SPECS/openscap.spec b/SPECS/openscap.spec index 479007b..49d7bd7 100644 --- a/SPECS/openscap.spec +++ b/SPECS/openscap.spec @@ -1,6 +1,6 @@ Name: openscap Version: 1.3.4 -Release: 5%{?dist} +Release: 5%{?dist}.alma Summary: Set of open source libraries enabling integration of the SCAP line of standards Group: System Environment/Libraries License: LGPLv2+ @@ -13,6 +13,10 @@ Patch4: openscap-1.3.5-yamlfilecontent-fix-field-names-PR_1619.patch Patch5: openscap-1.3.5-memory-PR_1627.patch Patch6: openscap-1.3.5-use-MALLOC_CHECK-in-tests-PR_1635.patch Patch7: openscap-1.3.5-test-non-local-gpfs-PR_1653.patch + +# Add AlmaLinux definitions +Patch100: openscap-1.3.3-almalinux.patch + BuildRequires: cmake >= 2.6 BuildRequires: swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser BuildRequires: rpm-devel @@ -219,6 +223,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/oscap-run-sce-script %changelog +* Mon Apr 19 2021 Andrew Lukoshko - 1.3.4-5.alma +- Add AlmaLinux definitions + * Wed Nov 25 2020 Evgenii Kolesnikov - 1.3.4-5 - Add check for non-local GPFS file system into Test Suite (RHBZ#1840578)