Accepting request 540060 from home:jfehlig:branches:Virtualization

- apparmor: add rules for new mediation features
  apparmor-rules-for-new-mediation-features.patch,
  apparmor-fine-grained-mount-rules.patch
  bsc#1066124, boo#1065123
- spec: unconditionally enable the wireshark dissector

OBS-URL: https://build.opensuse.org/request/show/540060
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=636

libvirt.spec

@@ -40,13 +40,13 @@
 # Optional bits on by default
 %define with_sanlock       0%{!?_without_sanlock:1}
 %define with_polkit_rules  1
+%define with_wireshark     0%{!?_without_wireshark:1}
 
 # A few optional bits off by default, we enable later
 %define with_cgconfig      0%{!?_without_cgconfig:0}
 %define with_numactl       0%{!?_without_numactl:0}
 %define with_numad         0%{!?_without_numad:0}
 %define with_firewalld     0%{!?_without_firewalld:0}
-%define with_wireshark     0%{!?_without_wireshark:0}
 %define with_libssh        0%{!?_without_libssh:0}
 
 # Xen no longer contains xm/xend so disable building the legacy Xen driver
@@ -131,13 +131,6 @@
     %endif
 %endif
 
-# libvirt commit 37397320 changed the configure check for wireshark to use
-# pkgconfig. Currently only the Leap 42.2 and Factory wireshark-devel packages
-# provide wireshark.pc. Disable the dissector for SLE and Leap <= 42.1
-%if 0%{?sle_version} < 120200 && ! 0%{?is_opensuse}
-    %define with_wireshark     0
-%endif
-
 # numad is used to manage the CPU and memory placement dynamically for
 # qemu, lxc, and uml drivers
 %if %{with_qemu} || %{with_lxc} || %{with_uml}
@@ -293,7 +286,7 @@ BuildRequires:  systemtap-sdt-devel
 BuildRequires:  numad
 %endif
 %if %{with_wireshark}
-BuildRequires:  wireshark-devel >= 1.12.1
+BuildRequires:  wireshark-devel >= 2.1.0
 %endif
 %if %{with_libssh}
 BuildRequires:  libssh-devel >= 0.7.0
@@ -310,6 +303,8 @@ Source100:      %{name}-rpmlintrc
 # Patches pending upstream review
 Patch100:       libxl-dom-reset.patch
 Patch101:       network-don-t-use-dhcp-authoritative-on-static-netwo.patch
+Patch102:       apparmor-rules-for-new-mediation-features.patch
+Patch103:       apparmor-fine-grained-mount-rules.patch
 # Need to go upstream
 Patch150:       xen-pv-cdrom.patch
 Patch151:       blockcopy-check-dst-identical-device.patch
@@ -883,6 +878,8 @@ libvirt plugin for NSS for translating domain names into IP addresses.
 %setup -q
 %patch100 -p1
 %patch101 -p1
+%patch102 -p1
+%patch103 -p1
 %patch150 -p1
 %patch151 -p1
 %patch152 -p1
@@ -1105,7 +1102,7 @@ make %{?_smp_mflags} -C examples distclean
 cp examples/lxcconvert/virt-lxc-convert %{buildroot}/%{_bindir}
 rm -f %{buildroot}/%{_libdir}/*.la
 %if %{with_wireshark}
-rm -f %{buildroot}/%{_libdir}/wireshark/plugins/libvirt.la
+rm -f %{buildroot}/%{_libdir}/wireshark/plugins/*/libvirt.la
 %endif
 rm -f %{buildroot}/%{_libdir}/*.a
 rm -f %{buildroot}/%{_libdir}/%{name}/lock-driver/*.la
@@ -1694,7 +1691,7 @@ fi
 %if %{with_wireshark}
 
 %files -n wireshark-plugin-libvirt
-%{_libdir}/wireshark/plugins/libvirt.so
+%{_libdir}/wireshark/plugins/*/libvirt.so
 %endif
 
 %files nss