diff --git a/openscap-leap-cpe-15.12.patch b/openscap-leap-cpe-15.12.patch new file mode 100644 index 0000000..98cb56f --- /dev/null +++ b/openscap-leap-cpe-15.12.patch @@ -0,0 +1,86 @@ +Index: openscap-1.3.4/cpe/openscap-cpe-dict.xml +=================================================================== +--- openscap-1.3.4.orig/cpe/openscap-cpe-dict.xml ++++ openscap-1.3.4/cpe/openscap-cpe-dict.xml +@@ -205,6 +205,14 @@ + openSUSE Leap 15.0 + oval:org.open-scap.cpe.opensuse:def:150 + ++ ++ openSUSE Leap 15.1 ++ oval:org.open-scap.cpe.opensuse:def:151 ++ ++ ++ openSUSE Leap 15.2 ++ oval:org.open-scap.cpe.opensuse:def:152 ++ + + openSUSE All Versions + oval:org.open-scap.cpe.opensuse:def:1 +Index: openscap-1.3.4/cpe/openscap-cpe-oval.xml +=================================================================== +--- openscap-1.3.4.orig/cpe/openscap-cpe-oval.xml ++++ openscap-1.3.4/cpe/openscap-cpe-oval.xml +@@ -678,6 +678,32 @@ + + + ++ ++ ++ openSUSE Leap 15.1 ++ ++ openSUSE Leap 15.1 ++ ++ ++ The operating system installed on the system is openSUSE Leap 15.1 ++ ++ ++ ++ ++ ++ ++ ++ openSUSE Leap 15.2 ++ ++ openSUSE Leap 15.2 ++ ++ ++ The operating system installed on the system is openSUSE Leap 15.2 ++ ++ ++ ++ ++ + + + Wind River Linux +@@ -1067,6 +1093,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ + +@@ -1379,6 +1415,12 @@ + + ^15.0$ + ++ ++ ^15.1$ ++ ++ ++ ^15.2$ ++ + + +- openscap-leap-cpe-15.12.patch: add CPE dict entries for openSUSE + Leap 15.1 and 15.2 + +------------------------------------------------------------------- +Sat Oct 31 08:33:48 UTC 2020 - Marcus Meissner + +- add dbus-1-devel buildrequires to enable systemd tests (bsc#1178301) + ------------------------------------------------------------------- Fri Oct 2 08:03:23 UTC 2020 - Robert Frohl diff --git a/openscap.spec b/openscap.spec index b77b128..1018e1d 100644 --- a/openscap.spec +++ b/openscap.spec @@ -39,6 +39,7 @@ Source4: scap-yast2sec-oval.xml Source5: oscap-scan.service Source6: oscap-scan.sh Patch0: openscap-new-suse.patch +Patch1: openscap-leap-cpe-15.12.patch URL: https://www.open-scap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: asciidoc @@ -57,6 +58,7 @@ BuildRequires: libgcrypt-devel BuildRequires: libxml2-devel # Use package name cause of "have choice for perl(XML::Parser): brp-check-suse perl-XML-Parser" BuildRequires: cmake +BuildRequires: dbus-1-devel BuildRequires: gcc-c++ BuildRequires: libblkid-devel BuildRequires: libcap-devel @@ -172,6 +174,7 @@ This package contains the Script Checking Engine Library (SCE) for OpenSCAP. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %if 0%{?with_bindings}