diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 13 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 4 |
3 files changed, 16 insertions, 3 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 9c78f088bb..19628ef344 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} - ${SPANDSP_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${LIBXML2_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 0e86bad483..48a295d9c7 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -13,6 +13,7 @@ %global with_c_ares 1 %global with_portaudio 0 %global with_spandsp 0 +%global with_libxml2 1 %global with_nghttp2 1 %global with_extcap 1 @@ -240,6 +241,10 @@ Requires: portaudio BuildRequires: spandsp-devel Requires: spandsp %endif +%if %{with_libxml2} +BuildRequires: libxml2-devel +Requires: libxml2 +%endif # Uncomment these if you want to be sure you get them... #BuildRequires: GeoIP-devel @@ -277,6 +282,11 @@ This package contains the GTK+ Wireshark GUI and desktop integration files. %if %{with_spandsp} --with-spandsp \ %endif +%if %{with_libxml2} + --with-libxml2 \ +%else + --without-libxml2 \ +%endif %if %{with_extcap} --with-extcap \ %else @@ -476,6 +486,9 @@ fi %endif %changelog +* Tue Apr 4 2017 Ahmad Fatoum +- Added libxml2 (as an option, defaulting to required). + * Tue Dec 20 2016 Anders Broman - Add with extcap (as an option, defaulting to yes). diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index ca37d94ed6..49691d3f4b 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} - ${SPANDSP_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${LIBXML2_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} - ${SPANDSP_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} + ${SPANDSP_DLL} ${LIBXML2_DLL} ${WINSPARKLE_DLL} ${ZLIB_DLL} ) #ensure uniqueness of files IF(NOT "${unique_file}" MATCHES "(^|;)${_dll}(;|$)") |