On Thu, Oct 29, 2020 at 11:47:01AM +0100, Andrea Bolognani wrote:

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.

Yeah, the previous revert was too ambitious. Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- libvirt.spec.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in index 84515cc7de..2a4324b974 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%{!?_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.26.2