diff options
author | Benoît Canet <benoit@scylladb.com> | 2016-10-18 15:27:37 +0200 |
---|---|---|
committer | Dario Lombardo <lomato@gmail.com> | 2016-11-02 13:12:32 +0000 |
commit | 58335bd86c393943ebb164182f851373d927847e (patch) | |
tree | c451b86351ee79c65444d72b3d8a4444215e9cb0 /packaging | |
parent | 461650544bdc1380ba9ca60e57ed7fdb547cdfc9 (diff) |
Packaging: Add dependencies for lz4 and snappy packages
Do it for Debian-like, RPM-based, and MacOS (via Homebrew) systems.
Signed-off-by: Benoît Canet <benoit@scylladb.com>
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Change-Id: I52802301815243021c039da6a27af6c534792439
Reviewed-on: https://code.wireshark.org/review/18272
Reviewed-by: Benoît Canet <benoit@scylladb.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 18 |
1 files changed, 18 insertions, 0 deletions
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). |