From d5c48bd5cc28743f04829abbb98706d983a164c349ac01689baaaa1ca4d16caa Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Mon, 24 Jun 2024 15:32:35 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/security/clamav?expand=0&rev=259 --- clamav.spec | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/clamav.spec b/clamav.spec index 809a843..e13f275 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,12 +22,12 @@ %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 %bcond_without sysuser_vscan %endif -%if 0%{?suse_version} > 1500 -%define vgcc %nil -%define CMake cmake -%else +%if 0%{?suse_version} <= 1500 %define vgcc 13 -%define CMake cmake +%if 0%{?sle_version} < 150400 +%define vrust 1.69 +%define vcmake 3 +%endif %endif %global confdir %_prefix%_sysconfdir @@ -57,19 +57,18 @@ Patch14: clamav-document-maxsize.patch Patch15: clamav-format.patch ExcludeArch: %{arml} -BuildRequires: %{CMake} -BuildRequires: cargo -BuildRequires: cmake-full -BuildRequires: gcc%{vgcc} -BuildRequires: gcc%{vgcc}-c++ +BuildRequires: cargo%{?vrust} +BuildRequires: cmake%{?vcmake} +BuildRequires: gcc%{?vgcc} +BuildRequires: gcc%{?vgcc}-c++ BuildRequires: libbz2-devel BuildRequires: libjson-c-devel BuildRequires: libopenssl-devel >= 1.0.2 BuildRequires: libxml2-devel BuildRequires: make -BuildRequires: rust -BuildRequires: rust+cargo >= 1.61.0 -BuildRequires: rust+rustc >= 1.61.0 +BuildRequires: rust%{?vrust} +#BuildRequires: rust+cargo >= 1.61.0 +#BuildRequires: rust+rustc >= 1.61.0 BuildRequires: sendmail-devel BuildRequires: systemd BuildRequires: pkgconfig(bzip2) @@ -193,7 +192,7 @@ chmod -x docs/html/images/flamegraph.svg %sysusers_generate_pre %{SOURCE65} vscan %endif %cmake \ -%if "%{vgcc}" != "" +%if "%{?vgcc}" != "" -DCMAKE_C_COMPILER=gcc-%{vgcc} \ -DCMAKE_CXX_COMPILER=g++-%{vgcc} \ %endif @@ -240,7 +239,7 @@ done %check # regression tests -%if !0%{?qemu_user_space_build:1} && 0%{?sle_version} >= 150500 +%if !0%{?qemu_user_space_build:1} && ( 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150500 ) # Run ctest with a single job to avoid failures # due to race conditions, e.g. on s390x. %define _smp_mflags -j1