From 58335bd86c393943ebb164182f851373d927847e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 18 Oct 2016 15:27:37 +0200 Subject: Packaging: Add dependencies for lz4 and snappy packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do it for Debian-like, RPM-based, and MacOS (via Homebrew) systems. Signed-off-by: Benoît Canet Signed-off-by: Alexis La Goutte Change-Id: I52802301815243021c039da6a27af6c534792439 Reviewed-on: https://code.wireshark.org/review/18272 Reviewed-by: Benoît Canet Petri-Dish: Alexis La Goutte Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss Reviewed-by: Dario Lombardo --- packaging/rpm/SPECS/wireshark.spec.in | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'packaging') diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 66af65489b..92d7d1105c 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -9,6 +9,7 @@ %bcond_with lua # Set these to 1 if you want to ensure your package includes support for them: +%global with_lz4_and_snappy 1 %global with_c_ares 1 %global with_portaudio 0 %global with_nghttp2 1 @@ -67,6 +68,20 @@ Requires: libpcap BuildRequires: zlib-devel Requires: zlib +%if %{with_lz4_and_snappy} +%if 0%{?suse_version} +BuildRequires: liblz4-devel +BuildRequires: snappy-devel +Requires: libsnappy1 +Requires: liblz4-1 +%else +BuildRequires: lz4-devel +BuildRequires: snappy-devel +Requires: snappy +Requires: lz4 +%endif +%endif + %if %{with_c_ares} %if 0%{?suse_version} # SuSE uses these package names (yes 2!): @@ -447,6 +462,9 @@ fi %endif %changelog +* Mon Oct 18 2016 Benoit Canet +- Add LZ4 and snappy compression support. + * Mon Aug 29 2016 Jeff Morriss - Add libnghttp2 (as an option, defaulting to required). -- cgit v1.2.1