From 07910e841e67ffbbcfb4ea8221244dab4ba13017 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Fri, 8 Feb 2019 12:04:02 +0100 Subject: [PATCH] RPM: respect options for disabling Qt, SpanDSP and BCG729 "%bcond_without" enables a feature by default. Be sure to explicitly disable features to match the requested configuration. Change-Id: I90687f35bcd953670e147be9e70af03aaeaef5dc Ping-Bug: 14606 Reviewed-on: https://code.wireshark.org/review/31933 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu --- CMakeLists.txt | 4 ++-- packaging/rpm/wireshark.spec.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5f61f6a40..93df11ac78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2715,8 +2715,8 @@ if(RPMBUILD_EXECUTABLE) if(CCACHE_EXECUTABLE) list(APPEND _rpmbuild_with_args --with ccache) endif() - if (BUILD_wireshark) - list(APPEND _rpmbuild_with_args --with qt5) + if(NOT BUILD_wireshark) + list(APPEND _rpmbuild_with_args --without qt5) endif() if (MAXMINDDB_FOUND) list(APPEND _rpmbuild_with_args --with mmdbresolve) diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index 262aee93cb..566fdcc73b 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -13,8 +13,8 @@ %bcond_with mmdbresolve %bcond_with lz4_and_snappy %bcond_with c_ares -%bcond_without spandsp -%bcond_without bcg729 +%bcond_with spandsp +%bcond_with bcg729 %bcond_with libxml2 %bcond_with nghttp2 %bcond_with sdjournal