[libvirt] [PATCHv2.5] specfile: fix make rpm when with_driver_modules is 1

[Laine Stump]

Commit ff76566 moved around things in the specfiles to put
driver-specific files into their appropriate sub-packages (when
with_driver_modules == 1), but accidentally changed things so that the
deamon-driver-network and daemon-config-network files were only
included in a package when with_driver_modules == 0. This broke "make
rpm" on fedora (where with_driver_modules == 1).

This patch follows the pattern (already used for the files in other
sub-modules) of duplicating the files for the main package
(!with_driver_modules) and the sub-package (with_driver_modules).
---

Changes from V1: realized that %{_datadir} is /usr/share, so
%{_datadir}/libvirt/networks/default.xml should be installed as a part
of daemon-driver-network (or the main package, if not building with
driver modules).


 libvirt.spec.in | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 849ec80..015e627 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1894,11 +1894,6 @@ exit 0
         %endif
     %endif # ! %{with_driver_modules}
 
-    %if %{with_network}
-%files daemon-config-network
-%defattr(-, root, root)
-    %endif
-
     %if %{with_nwfilter}
 %files daemon-config-nwfilter
 %defattr(-, root, root)
@@ -1915,6 +1910,14 @@ exit 0
         %if %{with_network}
 %files daemon-driver-network
 %defattr(-, root, root)
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
+%dir %{_datadir}/libvirt/networks/
+%{_datadir}/libvirt/networks/default.xml
+%ghost %dir %{_localstatedir}/run/libvirt/network/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
+%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
         %endif
 
-- 
1.8.3.1