From 8dfb6ed826dfb49c38467a0f3800243b2f982627 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Thu, 29 Oct 2020 11:00:37 +0100 Subject: [PATCH] Revert "Revert "spec: Simplify setting features off by default"" As explained in the original commit (31d687a3218c), these values are actually unaffected by the corresponding _without_* macros and so we can leave out the additional processing / obfuscation. This reverts commit ae23a87d85cfc2a964123d9bd44157a411428c0a. Signed-off-by: Andrea Bolognani Reviewed-by: Martin Kletzander --- libvirt.spec.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 06afd0dab8..0dbc040a7e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -97,14 +97,14 @@ %define with_numactl 0%{!?_without_numactl:1} # A few optional bits off by default, we enable later -%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} +%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 # Finally set the OS / architecture specific special cases -- 2.47.2