libvirt apparmor template profile was installed in the wrong place

Fixed the path to be /etc/apparmor.d/libvirt/TEMPLATE again.

- Fix the path to libvirtd AppArmor template profile

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

4f20084-fix-apparmor-install-patch.patch

@@ -0,0 +1,29 @@
+From f99c21d47fab54e98441e37d25c3f51c9e33fe47 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
+Date: Wed, 12 Feb 2014 10:37:53 +0100
+Subject: [PATCH] AppArmor: Fix the place where the template should be
+ installed
+
+The security driver expects /etc/apparmor.d/libvirt/TEMPLATE but we
+installed it to /etc/apparmor.d/libvirtd/TEMPLATE. Move the template to
+the expected place since that code was here long before.
+---
+ examples/apparmor/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am
+index 6e69440..2630fef 100644
+--- a/examples/apparmor/Makefile.am
++++ b/examples/apparmor/Makefile.am
+@@ -32,7 +32,7 @@ abstractions_DATA = \
+ 	libvirt-qemu \
+ 	$(NULL)
+ 
+-templatesdir = $(apparmordir)/libvirtd
++templatesdir = $(apparmordir)/libvirt
+ templates_DATA = \
+ 	TEMPLATE \
+ 	$(NULL)
+-- 
+1.8.5.2
+

libvirt.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Feb 12 15:58:18 UTC 2014 - cbosdonnat@suse.com
+
+- Fix the path to libvirtd AppArmor template profile
+
 -------------------------------------------------------------------
 Wed Jan 29 14:50:27 MST 2014 - jfehlig@suse.com
 

libvirt.spec

@@ -422,6 +422,7 @@ Source2:        libvirtd-relocation-server.fw
 Source99:       baselibs.conf
 # Upstream patches
 Patch0:         37564b47-xend-parse-response.patch
+Patch1:         4f20084-fix-apparmor-install-patch.patch
 # Need to go upstream
 Patch100:       xen-name-for-devid.patch
 Patch101:       ia64-clone.patch
@@ -930,6 +931,7 @@ namespaces.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -1435,11 +1437,11 @@ fi
 %if %{with_apparmor}
 %dir %{_sysconfdir}/apparmor.d
 %dir %{_sysconfdir}/apparmor.d/abstractions
-%dir %{_sysconfdir}/apparmor.d/libvirtd
+%dir %{_sysconfdir}/apparmor.d/libvirt
 %config(noreplace) %{_sysconfdir}/apparmor.d/usr.sbin.libvirtd
 %config(noreplace) %{_sysconfdir}/apparmor.d/usr.lib.libvirt.virt-aa-helper
 %config(noreplace) %{_sysconfdir}/apparmor.d/abstractions/libvirt-qemu
-%config(noreplace) %{_sysconfdir}/apparmor.d/libvirtd/TEMPLATE
+%config(noreplace) %{_sysconfdir}/apparmor.d/libvirt/TEMPLATE
 %{_libdir}/%{name}/virt-aa-helper
 %endif
 %config %{_fwdefdir}/libvirtd-relocation-server