From nobody Tue May 7 17:52:19 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; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1603749585; cv=none; d=zohomail.com; s=zohoarc; b=RBwcvf0r7aeckIBiJuPZOaiUnGck9tzK1gc4irsdeVh2yUdQTexsqtZq38RmTuxQOSET5EjxPrOdxgRVKFAMNfw33HJruh/ZooqNCjPrSbN5sOvzYhQcNATE4wiZSUioqaH9hlS85eqQR6Lq+FY41hiQ9azXvNp6fj6QCgfM+14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603749585; 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=zUkp7lxQWsAr7LdbIrc3jlroBkMTwzV/+Aqap8snbsI=; b=L+b/vyB6CwfrbdynziqwIjRkdxUZP7S0Z14ServMYl6DSnr1ZDawHXoOvdzka0MdQwbtAoA+M4AKDgnXZm+u8jmNOQBylorhQDQQX9gYTHIg0SCnrAafvrGcL/YKL/9iUqfH9msQWpx+eD2mKJEbDNwpsjAoB58vNSEd2kly0Zo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail 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 16037495855861003.9982704793606; Mon, 26 Oct 2020 14:59:45 -0700 (PDT) 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-471-GaalVRdhO6KPYAbhO89dnA-1; Mon, 26 Oct 2020 17:59:41 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5BD9364085; Mon, 26 Oct 2020 21:59:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 984E755798; Mon, 26 Oct 2020 21:59:33 +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 10C6492F41; Mon, 26 Oct 2020 21:59:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09QLsD57004962 for ; Mon, 26 Oct 2020 17:54:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9B024114B9A5; Mon, 26 Oct 2020 21:54:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 97422114B9A4 for ; Mon, 26 Oct 2020 21:54:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A3FA28D6328 for ; Mon, 26 Oct 2020 21:54:10 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-551-YYO3H4-xO_Ojt4LCMDEWvA-1; Mon, 26 Oct 2020 17:54:08 -0400 Received: by mail-qt1-f196.google.com with SMTP id h12so2871509qtc.9 for ; Mon, 26 Oct 2020 14:54:08 -0700 (PDT) Received: from localhost.localdomain (ool-18e49371.dyn.optonline.net. [24.228.147.113]) by smtp.gmail.com with ESMTPSA id g27sm7505055qkk.135.2020.10.26.14.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 14:54:07 -0700 (PDT) X-MC-Unique: GaalVRdhO6KPYAbhO89dnA-1 X-MC-Unique: YYO3H4-xO_Ojt4LCMDEWvA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zUkp7lxQWsAr7LdbIrc3jlroBkMTwzV/+Aqap8snbsI=; b=d3uhNtOvcFVGsIuqtaN8iipudffJQ5gOhWK0WvK3NdJrLndrsxsm7othMgBUFEt1C2 yqBkmdSYmVnBDKIMSTY7GDpWXqi+2/Qzx6xi5/EowGBpYL7pGspMdtQUtpzPqzoeM0sC Kl05HJpEr3apyer0nbQCZCazb+0VLTDnrlQqwrBV3AmqfKdFMcJ4LhkkB81m1LqPjcAz tfaWzztHESexpwA6AZBNrYoD80UljqMrOxJ2Njlddlh3/TG8lZU+6OWggMSS8vQ4jJfM 74nySfDSTMKgKFg/f+r0FUoaNcftDyCZz/vB/UG5x2iXy2VbUA8DM8ZmzibYi9QxBqrV fzkg== X-Gm-Message-State: AOAM533TFG2zEbvCRuv9KIxTzoqX6U9Nfdy3ykIIsd6RXxIxOpeHf1FR 7bcP/81D1vRMTn0YxYoMmqLhLqYYuUzOOg== X-Google-Smtp-Source: ABdhPJwFNbHVIldh9l4eheD+GXXsbezrCSvW9eDhSpl1r5uXtFAqyyBhbOAHqDV4AgtlNo2bfvG6Rw== X-Received: by 2002:ac8:4c8e:: with SMTP id j14mr17371743qtv.223.1603749247629; Mon, 26 Oct 2020 14:54:07 -0700 (PDT) From: Neal Gompa To: libvir-list@redhat.com Subject: [PATCH] Revert "spec: Simplify setting features off by default" Date: Mon, 26 Oct 2020 17:53:55 -0400 Message-Id: <20201026215355.58345-1-ngompa13@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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.15 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 Content-Type: text/plain; charset="utf-8" As it turns out, the rather complicated structure that is currently used for enabling or disabling features in the libvirt build does not cleanly map well to RPM's bcond feature. Consequently, we need these back in order to support trivially activating these features through extra macros as build inputs. This reverts commit 31d687a3218c9072d7050dd608e013e063ca180f. Signed-off-by: Neal Gompa Reviewed-by: Michal Privoznik --- libvirt.spec.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2a4324b974..84515cc7de 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -98,14 +98,14 @@ %define with_numactl 0%{!?_without_numactl:1} =20 # A few optional bits off by default, we enable later -%define with_fuse 0 -%define with_sanlock 0 -%define with_numad 0 -%define with_firewalld_zone 0 -%define with_libssh2 0 -%define with_wireshark 0 -%define with_libssh 0 -%define with_dmidecode 0 +%define with_fuse 0%{!?_without_fuse:0} +%define with_sanlock 0%{!?_without_sanlock:0} +%define with_numad 0%{!?_without_numad:0} +%define with_firewalld_zone 0%{!?_without_firewalld:0} +%define with_libssh2 0%{!?_without_libssh2:0} +%define with_wireshark 0%{!?_without_wireshark:0} +%define with_libssh 0%{!?_without_libssh:0} +%define with_dmidecode 0%{!?_without_dmidecode:0} =20 # Finally set the OS / architecture specific special cases =20 --=20 2.28.0