From 4a410b825f8861715d8f5cf0ee3178372c8259da Mon Sep 17 00:00:00 2001 From: Evgeny Kolesnikov Date: Mon, 29 Jul 2024 13:50:16 +0200 Subject: [PATCH] Add c10s to Packit jobs --- .packit.yaml | 4 ++-- openscap.spec | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index e16f647f94..2cb21caa35 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -16,16 +16,16 @@ jobs: metadata: targets: - fedora-all-x86_64 - - centos-stream-8-x86_64 - centos-stream-9-x86_64 + - centos-stream-10-x86_64 - job: tests trigger: pull_request metadata: targets: - fedora-all-x86_64 - - centos-stream-8-x86_64 - centos-stream-9-x86_64 + - centos-stream-10-x86_64 - <<: *build trigger: commit diff --git a/openscap.spec b/openscap.spec index 50a92839e7..c5e62b73bc 100644 --- a/openscap.spec +++ b/openscap.spec @@ -15,11 +15,7 @@ BuildRequires: gcc-c++ BuildRequires: swig libxml2-devel libxslt-devel perl-generators perl-XML-Parser BuildRequires: rpm-devel BuildRequires: libgcrypt-devel -%if 0%{?fedora} BuildRequires: pcre2-devel -%else -BuildRequires: pcre-devel -%endif BuildRequires: libacl-devel BuildRequires: libselinux-devel BuildRequires: libcap-devel @@ -131,12 +127,9 @@ Tool for scanning Atomic containers. %build %undefine __cmake_in_source_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_PERL=OFF \ - -DENABLE_DOCS=ON \ - -DGCONF_LIBRARY= + -DENABLE_DOCS=ON %cmake_build make docs