Jim Fehlig wrote:
Michal Privoznik wrote:
On 06.12.2013 00:36, Jim Fehlig wrote:
Only add /etc/libvirt/nwfilter to the libvirt-daemon files list if building with nwfilter support. --- libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/libvirt.spec.in b/libvirt.spec.in index eff7103..7f2a23a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1752,7 +1752,9 @@ exit 0 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart %endif
+ %if %{with_nwfilter} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ + %endif
%if %{with_systemd} %{_unitdir}/libvirtd.service
Not only that but this one is worth fixing too:
diff --git a/libvirt.spec.in b/libvirt.spec.in index 7f2a23a..c14d343 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -390,6 +390,7 @@ Requires: libvirt-daemon-config-network = %{version}-%{release} %endif %if %{with_nwfilter} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} %endif %if %{with_driver_modules} %if %{with_libxl} @@ -416,7 +417,6 @@ Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} -Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} %endif %endif Requires: libvirt-client = %{version}-%{release}
libvirt-daemon-driver-nwfilter is only built when with_driver_modules is defined, so I'll need to wrap this in a with_nwfilter within with_driver_modules. Is it ok if I squash in the following?
I modified commit message to reflect this change. Updated patch attached. Regards, Jim