]> xenbits.xensource.com Git - people/dariof/libvirt.git/commitdiff
specfile: fix make rpm when with_driver_modules is 1
authorLaine Stump <laine@laine.org>
Fri, 13 Dec 2013 15:03:26 +0000 (17:03 +0200)
committerLaine Stump <laine@laine.org>
Tue, 17 Dec 2013 12:33:00 +0000 (14:33 +0200)
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).

libvirt.spec.in

index 849ec80dbace2d470014eaf49994a072c8a3753e..3f8db094301fee79313f1c1bdab1d27ad2e5d357 100644 (file)
@@ -1915,6 +1915,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