]> xenbits.xensource.com Git - libvirt.git/commitdiff
libvirt.spec.in: Adapt to newest wireshark plugindir
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 27 Jul 2016 14:58:32 +0000 (16:58 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Wed, 27 Jul 2016 15:01:18 +0000 (17:01 +0200)
In the old days, when wireshark plugin was introduced it was
installed under /usr/lib64/wireshark/plugins/$VERSION/ while with
wireshark-2.1.0 this path has changed just to
/usr/lib64/wireshark/plugins. We should teach our spec file about
this change.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
libvirt.spec.in

index cc5d722098739ea32dcb6638dd4270fb5fc1bb3d..35c74491cba17581a3bcf7ab7315c493b4979634 100644 (file)
@@ -406,7 +406,7 @@ BuildRequires: numad
 %endif
 
 %if %{with_wireshark}
-BuildRequires: wireshark-devel
+BuildRequires: wireshark-devel >= 2.1.0
 %endif
 
 Provides: bundled(gnulib)
@@ -1212,9 +1212,7 @@ 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}
-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
+rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/libvirt.la
 %endif
 
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/