From: Michal Privoznik Date: Wed, 27 Jul 2016 14:58:32 +0000 (+0200) Subject: libvirt.spec.in: Adapt to newest wireshark plugindir X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cd9fcc8be7dcb9126d70f744ce54b0b742eeefb8;p=libvirt.git libvirt.spec.in: Adapt to newest wireshark plugindir 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 --- diff --git a/libvirt.spec.in b/libvirt.spec.in index cc5d722098..35c74491cb 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -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/