From nobody Sat May 4 03:26:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612289126; cv=none; d=zohomail.com; s=zohoarc; b=MuOmMVM1dEkplCI+ZgggIEdGaXH/rcR72MtGKrwxcU1sgPkdEpvi5sgnGwzzwei00VXBTqsuSKEJZds4hWVpvS0Ca0L84431gIsWLl4XNQwvd7Ctg7qxSQqZQ3hkNLvMAaL3/yd54utgYVfAqsSQlpT+UDxB/+iSpNrsM3NdApc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612289126; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=thATEGD/xhTnZ8MYWNZmISwJJkcmfcjIcPmoXrV17VY=; b=CVBU5dZGnVb7YmPKT44TyFnUKuFyO6HYLp+xY9N9Ish0+PUvMDab/upx3V5VjJlLzvq5a0DkVDFjDo5dIgdV2LE2S/PMPr6/ck7X+jqoCsQTrWYRHowRUT258sJe3ekDUQwYXIFuCl9/X1YtWwSyG/GF6ud4zMDk0whOJqOZ0Mk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1612289126004450.909582698122; Tue, 2 Feb 2021 10:05:26 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-393-uC-zXOPpMjePU0_Ni0_e8A-1; Tue, 02 Feb 2021 13:05:21 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 93521189CD24; Tue, 2 Feb 2021 18:05:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A78EA60C66; Tue, 2 Feb 2021 18:05:14 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7E47A18095CB; Tue, 2 Feb 2021 18:05:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 112I5AZm023099 for ; Tue, 2 Feb 2021 13:05:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6F0551975E; Tue, 2 Feb 2021 18:05:10 +0000 (UTC) Received: from vhost2.laine.org (ovpn-112-159.phx2.redhat.com [10.3.112.159]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27B4319C71; Tue, 2 Feb 2021 18:05:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612289124; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=thATEGD/xhTnZ8MYWNZmISwJJkcmfcjIcPmoXrV17VY=; b=VCc+ZLp03Biw+61ilMkP6ceGCK3ytEPWetUJ15V9vxu+8YyiyzdpAv1hPkkna4X443tmpn xoG668H4+nmwLZTuzi/tzpyI73XftOsl713M7l/1gHA6e7nVa9S0ey0Gje4aZpE/VD1wRx ZqjBvWh/k5rZJurWgTv3nvAeSqMFvFc= X-MC-Unique: uC-zXOPpMjePU0_Ni0_e8A-1 From: Laine Stump To: libvir-list@redhat.com Subject: [PATCH] build: fix specfile logic for disabling netcf Date: Tue, 2 Feb 2021 13:05:04 -0500 Message-Id: <20210202180504.951696-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Neal Gompa X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" I *thought* I had tested all the combinations of manually setting --without netcf, different versions of Fedora, etc, but apparently not. The check in libvirt.spec.in to see if the target was an older Fedora or older RHEL would alway resolve to true, because, e.g., if {?fedora} is undefined, then "0%{?fedora} < 34" is "0 < 34", which is always true. Since both {?fedora} and {?rhel} are never defined at the same time, the result of the entire expression is always true. Fix this by qualifying each subexpression. Fixes: 35d5b26aa433bd33f4b33be3dbb67313357f97f9 Signed-off-by: Laine Stump Reviewed-by: Daniel P. Berrang=C3=A9 --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 34b481c69e..29b476184d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -146,7 +146,7 @@ %define with_firewalld_zone 0%{!?_without_firewalld_zone:1} %endif =20 -%if 0%{?fedora} < 34 || 0%{?rhel} < 9 +%if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9) %define with_netcf 0%{!?_without_netcf:1} %endif =20 --=20 2.29.2