From 93d9a76b567eea5a31bfb5b5930a40f66200fe1ebcab13addd412ce6a26c99ea Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Tue, 13 Jun 2023 22:53:13 +0000
Subject: [PATCH] - spec: Don't move apparmor profiles to modular daemon
 subpackages

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=987
---
 libvirt-9.4.0.tar.xz |  4 ++--
 libvirt.changes      |  5 +++++
 libvirt.spec         | 10 ++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/libvirt-9.4.0.tar.xz b/libvirt-9.4.0.tar.xz
index 305e8ef..dac84f2 100644
--- a/libvirt-9.4.0.tar.xz
+++ b/libvirt-9.4.0.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ae33efdacd3fa6f69222fe41bf90d1ee339b8cb9efa416d5a5335e3227b219a
-size 9592144
+oid sha256:bbded6ded68378a298b1c1bdae89ec4c166ee86749d0a97f9efa859055d5a7f1
+size 9592028
diff --git a/libvirt.changes b/libvirt.changes
index 6ea7b62..78fea3b 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 13 22:28:33 UTC 2023 - James Fehlig <jfehlig@suse.com>
+
+- spec: Don't move apparmor profiles to modular daemon subpackages
+
 -------------------------------------------------------------------
 Wed Jun  7 22:21:45 UTC 2023 - James Fehlig <jfehlig@suse.com>
 
diff --git a/libvirt.spec b/libvirt.spec
index ddfb1f6..9d1d80d 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1546,6 +1546,10 @@ fi
 %dir %{_sysconfdir}/apparmor.d/%{name}/
 %dir %{_sysconfdir}/apparmor.d/local/
 %config %{_sysconfdir}/apparmor.d/usr.lib.libvirt.virt-aa-helper
+%config %{_sysconfdir}/apparmor.d/abstractions/libvirt-qemu
+%config %{_sysconfdir}/apparmor.d/abstractions/libvirt-lxc
+%config %{_sysconfdir}/apparmor.d/%{name}/TEMPLATE.lxc
+%config %{_sysconfdir}/apparmor.d/%{name}/TEMPLATE.qemu
 %config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.lib.libvirt.virt-aa-helper
 %{_libexecdir}/virt-aa-helper
 %endif
@@ -1757,8 +1761,6 @@ fi
 %if %{with_apparmor}
 %config %{_sysconfdir}/apparmor.d/usr.sbin.virtqemud
 %config(noreplace) %{_sysconfdir}/apparmor.d/local/usr.sbin.virtqemud
-%config %{_sysconfdir}/apparmor.d/abstractions/libvirt-qemu
-%config %{_sysconfdir}/apparmor.d/%{name}/TEMPLATE.qemu
 %endif
 %config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf
 %{_datadir}/augeas/lenses/virtqemud.aug
@@ -1793,10 +1795,6 @@ fi
 
 %files daemon-driver-lxc
 %config(noreplace) %{_sysconfdir}/%{name}/virtlxcd.conf
-%if %{with_apparmor}
-%config %{_sysconfdir}/apparmor.d/abstractions/libvirt-lxc
-%config %{_sysconfdir}/apparmor.d/%{name}/TEMPLATE.lxc
-%endif
 %{_datadir}/augeas/lenses/virtlxcd.aug
 %{_datadir}/augeas/lenses/tests/test_virtlxcd.aug
 %{_unitdir}/virtlxcd.service