[libvirt] [PATCH 2/2] libvirt.spec.in: Adapt to newest wireshark plugindir

Michal Privoznik mprivozn at redhat.com
Wed Jul 27 15:03:26 UTC 2016


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 at redhat.com>
---
 libvirt.spec.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index cc5d722..35c7449 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/
-- 
2.8.4




More information about the libvir-list mailing list