aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
diff options
context:
space:
mode:
authorBalint Reczey <balint@balintreczey.hu>2016-08-26 15:18:29 +0200
committerMichael Mann <mmann78@netscape.net>2016-10-13 19:26:10 +0000
commitb1cc056b12702435f6ebdc6ba0a8e17a41e159a0 (patch)
treee03028577c61da59952dd3c319aff62faf917a14 /packaging/rpm
parentad0a016bd2f7f82e4db8bbac13f959ad3bc7ecf4 (diff)
Remove nghttp2 code and use system' nghttp2
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/SPECS/wireshark.spec.in10
1 files changed, 10 insertions, 0 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in
index a9b16c1c26..66af65489b 100644
--- a/packaging/rpm/SPECS/wireshark.spec.in
+++ b/packaging/rpm/SPECS/wireshark.spec.in
@@ -11,6 +11,7 @@
# Set these to 1 if you want to ensure your package includes support for them:
%global with_c_ares 1
%global with_portaudio 0
+%global with_nghttp2 1
# Set at most one of these two:
# Note that setcap requires rpmbuild 4.7.0 or later.
@@ -78,11 +79,17 @@ BuildRequires: c-ares-devel
Requires: c-ares
%endif
%endif
+
%if %{with lua}
BuildRequires: lua-devel < 5.3
Requires: lua < 5.3
%endif
+%if %{with_nghttp2}
+BuildRequires: libnghttp2-devel
+Requires: libnghttp2
+%endif
+
# Uncomment these if you want to be sure you get them...
#BuildRequires: krb5-devel
#BuildRequires: libsmi-devel
@@ -440,6 +447,9 @@ fi
%endif
%changelog
+* Mon Aug 29 2016 Jeff Morriss
+- Add libnghttp2 (as an option, defaulting to required).
+
* Wed Aug 17 2016 Jeff Morriss
- wireshark.pc is now installed with Wireshark, include it in the RPM.