[PATCH] Fix RPM spec for wireshark on Fedora < 24

["Daniel P. Berrange" <berrange@xxxxxxxxxx>]

This previous commit

  commit cd9fcc8be7dcb9126d70f744ce54b0b742eeefb8
  Author: Michal Privoznik <mprivozn@xxxxxxxxxx>
  Date:   Wed Jul 27 16:58:32 2016 +0200

    libvirt.spec.in: Adapt to newest wireshark plugindir

Adapted the libvirt spec for wireshark >= 2.1.0 but
this ignored the fact that we enable wireshark from
Fedora 21 and 2.1.0 was only added in Fedora 24

Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
 libvirt.spec.in | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 35c7449..5841f45 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -406,7 +406,11 @@ BuildRequires: numad
 %endif
 
 %if %{with_wireshark}
+%if 0%{fedora} >= 24
 BuildRequires: wireshark-devel >= 2.1.0
+%else
+BuildRequires: wireshark-devel >= 1.12.1
+%endif
 %endif
 
 Provides: bundled(gnulib)
@@ -1212,7 +1216,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a
 %if %{with_wireshark}
+%if 0%{fedora} >= 24
 rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.la
+%else
+rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la
+mv $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.so \
+      $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.so
+%endif
 %endif
 
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
-- 
2.5.5

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list