diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 11 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 3406afe4a8..9c78f088bb 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -132,7 +132,7 @@ set(_all_manifest_contents "# Files required for all sections. Generated by CMak foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n") endforeach() diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index df4dbf4e8d..c2ffb1f581 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -12,6 +12,7 @@ %global with_lz4_and_snappy 1 %global with_c_ares 1 %global with_portaudio 0 +%global with_spandsp 0 %global with_nghttp2 1 # Set at most one of these two: @@ -234,6 +235,10 @@ BuildRequires: update-desktop-files BuildRequires: portaudio-devel Requires: portaudio %endif +%if %{with_spandsp} +BuildRequires: spandsp-devel +Requires: spandsp +%endif # Uncomment these if you want to be sure you get them... #BuildRequires: GeoIP-devel @@ -268,6 +273,9 @@ This package contains the GTK+ Wireshark GUI and desktop integration files. %if %{with_portaudio} --with-portaudio \ %endif +%if %{with_spandsp} + --with-spandsp \ +%endif %if %{with qt} --with-qt=4 \ %else @@ -462,6 +470,9 @@ fi %endif %changelog +* Mon Dec 5 2016 Jeff Morriss +- Add spandsp (as an option, defaulting to not required). + * Tue Oct 18 2016 Benoit Canet - Add LZ4 and snappy compression support. diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 2cc5ea7f41..ca37d94ed6 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -124,7 +124,7 @@ SET(unique_component "") foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) #ensure uniqueness of files IF(NOT "${unique_component}" MATCHES "(^|;)${_dll}(;|$)") @@ -149,7 +149,7 @@ SET(unique_file "") foreach(_dll ${GLIB2_DLLS} ${CARES_DLL} ${GCRYPT_DLLS} ${GEOIP_DLL} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLL} ${LUA_DLL} ${LZ4_DLL} ${NGHTTP2_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) #ensure uniqueness of files IF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)") |