[PATCH RFC 5/6] spec: Move more files to the daemon-core subpackage

[Jim Fehlig]

Signed-off-by: Jim Fehlig <jfehlig at suse.com>
---
 libvirt.spec.in | 71 +++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 86b4922531..c83e6a1ab3 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1810,53 +1810,16 @@ exit 0
 %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
-%dir %{_datadir}/libvirt/
-
-%ghost %dir %{_rundir}/libvirt/
-%ghost %dir %{_rundir}/libvirt/common/
-
-%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
-%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
-%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/
-%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/
-%dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/
-
-
-%dir %attr(0755, root, root) %{_libdir}/libvirt/
-%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/
-%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver
-%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
 
 %{_datadir}/augeas/lenses/libvirtd.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd.aug
-%{_datadir}/augeas/lenses/libvirt_lockd.aug
-%if %{with_qemu}
-%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
-%endif
-
-%{_datadir}/polkit-1/actions/org.libvirt.unix.policy
-%{_datadir}/polkit-1/actions/org.libvirt.api.policy
-%{_datadir}/polkit-1/rules.d/50-libvirt.rules
-
-%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
-
-%attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
-
-%attr(0755, root, root) %{_bindir}/virt-ssh-helper
 
 %attr(0755, root, root) %{_sbindir}/libvirtd
 %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
 
-%{_mandir}/man1/virt-admin.1*
-%{_mandir}/man1/virt-host-validate.1*
-%{_mandir}/man8/virt-ssh-helper.8*
 %{_mandir}/man8/libvirt-guests.8*
 %{_mandir}/man8/libvirtd.8*
 
-%{_bindir}/virt-host-validate
-%{_bindir}/virt-admin
-%{_datadir}/bash-completion/completions/virt-admin
-
 %files daemon-core
 %{_unitdir}/virtproxyd.service
 %{_unitdir}/virtproxyd.socket
@@ -1874,6 +1837,19 @@ exit 0
 %config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
 %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
 
+%dir %{_datadir}/libvirt/
+
+%ghost %dir %{_rundir}/libvirt/
+%ghost %dir %{_rundir}/libvirt/common/
+
+%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
+%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
+%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/
+%dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/
+%dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/
+
+%dir %attr(0755, root, root) %{_libdir}/libvirt/
+%dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/
 %dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver
 %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
 
@@ -1883,6 +1859,20 @@ exit 0
 %{_datadir}/augeas/lenses/tests/test_virtlockd.aug
 %{_datadir}/augeas/lenses/virtproxyd.aug
 %{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
+%{_datadir}/augeas/lenses/libvirt_lockd.aug
+%if %{with_qemu}
+%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
+%endif
+
+%{_datadir}/polkit-1/actions/org.libvirt.unix.policy
+%{_datadir}/polkit-1/actions/org.libvirt.api.policy
+%{_datadir}/polkit-1/rules.d/50-libvirt.rules
+
+%dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
+
+%attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
+
+%attr(0755, root, root) %{_bindir}/virt-ssh-helper
 
 %attr(0755, root, root) %{_sbindir}/virtproxyd
 %attr(0755, root, root) %{_sbindir}/virtlogd
@@ -1891,6 +1881,13 @@ exit 0
 %{_mandir}/man8/virtlogd.8*
 %{_mandir}/man8/virtlockd.8*
 %{_mandir}/man8/virtproxyd.8*
+%{_mandir}/man1/virt-admin.1*
+%{_mandir}/man1/virt-host-validate.1*
+%{_mandir}/man8/virt-ssh-helper.8*
+
+%{_bindir}/virt-host-validate
+%{_bindir}/virt-admin
+%{_datadir}/bash-completion/completions/virt-admin
 
 %files daemon-config-network
 %dir %{_datadir}/libvirt/networks/
-- 
2.37.3