osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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 <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Peter Wu 2019-02-08 12:04:02 +01:00
parent 55db3d523d
commit 07910e841e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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)

4
packaging/rpm/wireshark.spec.in
View File

@ -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