aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/rpm
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2018-09-05 16:29:34 -0700
committerAnders Broman <a.broman58@gmail.com>2018-10-01 08:58:13 +0000
commitf69108b84e9f996641d9c920fffc19853115f56b (patch)
tree76d5045fb254b7f67c73a5ca0b12f55c0edda9a1 /packaging/rpm
parente1ef8f6a408cb5a017ff5d15deddcb2727ddf90e (diff)
Add a systemd Journal Export extcap.
Add an sdjournal extcap, which reads journal entries using the sd-journal API and dumps them as journal Export Format records. Change-Id: I17ccfa88ab5d053c16c869cd26e580d84022502e Reviewed-on: https://code.wireshark.org/review/29479 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/wireshark.spec.in18
1 files changed, 18 insertions, 0 deletions
diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in
index c79f837f95..87b1d50d99 100644
--- a/packaging/rpm/wireshark.spec.in
+++ b/packaging/rpm/wireshark.spec.in
@@ -18,6 +18,7 @@
%bcond_without bcg729
%bcond_with libxml2
%bcond_with nghttp2
+%bcond_with sdjournal
%bcond_with guides
@@ -109,6 +110,15 @@ BuildRequires: libnghttp2-devel
Requires: libnghttp2
%endif
+%if %{with sdjournal}
+BuildRequires: systemd-devel
+%if 0%{?suse_version}
+Requires: libsystemd0
+%else
+Requires: systemd-libs
+%endif
+%endif
+
# Uncomment these if you want to be sure you get them...
#BuildRequires: krb5-devel
#BuildRequires: libsmi-devel
@@ -270,6 +280,11 @@ cmake3 \
%else
-DENABLE_NGHTTP2=OFF \
%endif
+%if %{with sdjournal}
+ -DBUILD_sdjournal=ON \
+%else
+ -DBUILD_sdjournal=OFF \
+%endif
-DDISABLE_WERROR=ON \
%if %{with ninja}
-G Ninja \
@@ -439,6 +454,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/pkgconfig/wireshark.pc
%changelog
+* Fri Sep 28 2018 Gerald Combs
+- Add sdjournal
+
* Thu Sep 27 2018 Jeff Morriss
- Have the qt package obsolute the old gnome and gtk packages. This allows
clean upgrades to the Qt version.