From 1353b06138a3e36274c144902b056262345bb8b8 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 18 Dec 2020 12:56:28 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/openscap.git#733bd2da70696622461654690e5b1fbddc67359c --- openscap.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/openscap.spec b/openscap.spec index 55bf867..dc0fdf0 100644 --- a/openscap.spec +++ b/openscap.spec @@ -1,6 +1,6 @@ Name: openscap Version: 1.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: Set of open source libraries enabling integration of the SCAP line of standards License: LGPLv2+ @@ -24,7 +24,6 @@ BuildRequires: libblkid-devel BuildRequires: bzip2-devel BuildRequires: asciidoc BuildRequires: openldap-devel -BuildRequires: GConf2-devel BuildRequires: glib2-devel BuildRequires: dbus-devel BuildRequires: libyaml-devel @@ -35,7 +34,6 @@ BuildRequires: bzip2 Requires: bash Requires: bzip2-libs Requires: dbus -Requires: GConf2 Requires: glib2 Requires: libacl Requires: libblkid @@ -128,7 +126,11 @@ Tool for scanning Atomic containers. %build # gconf is a legacy system not used any more, and it blocks testing of oscap-anaconda-addon # as gconf is no longer part of the installation medium -%cmake -DENABLE_DOCS=ON .. -DOPENSCAP_PROBE_UNIX_GCONF=OFF -DGCONF_LIBRARY= +%cmake \ + -DENABLE_PERL=OFF \ + -DENABLE_DOCS=ON \ + -DOPENSCAP_PROBE_UNIX_GCONF=OFF \ + -DGCONF_LIBRARY= %cmake_build make docs @@ -201,6 +203,10 @@ pathfix.py -i %{__python3} -p -n $RPM_BUILD_ROOT%{_bindir}/scap-as-rpm %{_mandir}/man8/oscap-podman.8* %changelog +* Wed Dec 09 2020 Jan Černý - 1:1.3.4-3 +- Remove dependency on GConf2 +- Update cmake command + * Tue Nov 03 2020 Evgenii Kolesnikov - 1.3.4-2 - Fix problems uncovered by the Coverity Scan - Fix field names handling in yamlfilecontent probe