From 1b3bd7674a88232f9fcf29f23b534cef9e4f8b95 Mon Sep 17 00:00:00 2001 From: Michal Ambroz Date: Mon, 27 Nov 2023 06:44:53 +0100 Subject: [PATCH] add conditional for apt-libs so the same spec file can be used for Centos --- openscap.spec | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/openscap.spec b/openscap.spec index 0a78b87..619e536 100644 --- a/openscap.spec +++ b/openscap.spec @@ -20,6 +20,7 @@ Patch1: openscap-1.3.9-perlpath.patch # Implicit declarations due to missing includes +# reported in #PR2060, #PR2061, #PR2062 Patch2: openscap-1.3.9-includes.patch BuildRequires: make @@ -44,8 +45,14 @@ BuildRequires: dbus-devel BuildRequires: libyaml-devel BuildRequires: xmlsec1-devel BuildRequires: xmlsec1-openssl-devel + +# apt-libs missing on Centos +%if 0%{?fedora} BuildRequires: apt-devel +%endif + BuildRequires: opendbx-devel + # GConf2 not used on purpose as obsolete and blocking anaconda addon # BuildRequires: GConf2-devel BuildRequires: procps-ng-devel @@ -70,6 +77,13 @@ Requires: popt Requires: procps Requires: xmlsec1 xmlsec1-openssl +# apt-libs missing on Centos +%if 0%{?fedora} +Requires: apt-libs +%endif + + + %description OpenSCAP is a set of open source libraries providing an easier path for integration of the SCAP line of standards. SCAP is a line of standards @@ -102,13 +116,13 @@ libraries can be used by python3. %package perl Summary: Perl bindings for %{name} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -BuildRequires: coreutils -BuildRequires: findutils -BuildRequires: make -BuildRequires: perl-generators +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make +BuildRequires: perl-generators BuildRequires: perl-interpreter BuildRequires: perl-devel -BuildRequires: perl-XML-Parser +BuildRequires: perl-XML-Parser %description perl The perl package contains the bindings so that %{name} @@ -262,6 +276,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_mandir}/man8/oscap-podman.8* %changelog +* Thu Nov 23 2023 Michal Ambroz - 1:1.3.9-2 +- adding conditional for apt-devel apt-libs as proposed upstream + * Thu Nov 23 2023 Michal Ambroz - 1:1.3.9-1 - bump to 1.3.9 - provide perl binding