[PATCH] Revert "spec: Simplify setting features off by default"

Neal Gompa ngompa13 at gmail.com
Mon Oct 26 21:53:55 UTC 2020

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 <ngompa13 at gmail.com>
 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}
 # 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}
 # Finally set the OS / architecture specific special cases

More information about the libvir-list mailing list