From: Daniel P. Berrangé <berrange@redhat.com>
Date: Fri, 13 Nov 2020 11:14:29 +0000 (+0000)
Subject: rpm: enable wireshark build for RHEL-8 and later
X-Git-Tag: v6.10.0-rc1~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e09a6f1fd6250738895dfe8645dfc29bb63f7da;p=thirdparty%2Flibvirt.git

rpm: enable wireshark build for RHEL-8 and later

wireshark plugin was disabled in RHEL because RHEL-7 was too old, but we
forgot to enable it in RHEL-8 where it builds fine.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 43955b0e09..de76878bc6 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -167,8 +167,8 @@
     %define with_libssh2 0%{!?_without_libssh2:1}
 %endif
 
-# Enable wireshark plugins for all distros shipping libvirt 1.2.2 or newer
-%if 0%{?fedora}
+# Enable wireshark plugins for all distros except RHEL-7
+%if 0%{?fedora} || 0%{?rhel} > 7
     %define with_wireshark 0%{!?_without_wireshark:1}
     %define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan
 %endif