diff options
author | Dániel Bakai <bakaidl@gmail.com> | 2019-04-10 12:52:52 +0200 |
---|---|---|
committer | Peter Wu <peter@lekensteyn.nl> | 2019-04-22 15:24:46 +0000 |
commit | 9ce60b173bf17b7d20695d9dc1de050989019664 (patch) | |
tree | 95ec8b8554415ef2c80d6d9950cc9201c8d22c94 /packaging | |
parent | 51ac1047a7e434a0b2e264780b2fa31f1d986898 (diff) |
Add brotli decompression support for HTTP and HTTP2 dissectors.
Change-Id: I9c09f55673187f6fee723fcd72798fb6b9958b03
Reviewed-on: https://code.wireshark.org/review/32745
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/rpm/wireshark.spec.in | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index 56e1caecce..eab250cddf 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -19,6 +19,7 @@ %bcond_with nghttp2 %bcond_with sdjournal %bcond_with guides +%bcond_with brotli # Set at most one of these two: @@ -145,6 +146,21 @@ Requires: systemd-libs %endif %endif +%if %{with brotli} +%if 0%{?suse_version} +BuildRequires: libbrotli-devel +# On SUSE libbrotli-devel installs the libbrotlidec.so, libbrotlienc.so +# and libbrotlicommon.so symlinks, but only installs the libbrotlicommon1 and libbrotlienc1 +# packages, leaving the libbrotlidec.so symlink broken, so we have to include libbrotlidec1 +# as a build-time dependency... +BuildRequires: libbrotlidec1 +Requires: libbrotlidec1 +%else +BuildRequires: brotli-devel +Requires: brotli +%endif +%endif + # Uncomment these if you want to be sure you get them... #BuildRequires: krb5-devel #BuildRequires: libsmi-devel @@ -315,6 +331,11 @@ cmake3 \ %else -DBUILD_sdjournal=OFF \ %endif +%if %{with brotli} + -DENABLE_BROTLI=ON \ +%else + -DENABLE_BROTLI=OFF \ +%endif -DDISABLE_WERROR=ON \ %if %{with ninja} -G Ninja \ @@ -476,6 +497,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/wireshark.pc %changelog +* Mon Apr 22 2019 Daniel Bakai +- Added brotli (as an option, defaulting to not required). + * Fri Sep 28 2018 Gerald Combs - Add sdjournal |