From 86007cba4c23b1b13e7e27af265a1bcdc4392483 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 9 Jan 2013 11:39:45 -0700 Subject: [PATCH] spec: remove redundant %if The daemon-driver-{qemu,lxc} packages are only built if %{with_driver_modules} is specified, so they do not need to further test this condition. Likewise, the daemon package is only built if %{with_libvirtd} is specified, so it does not need to further test this condition. * libvirt.spec.in (daemon-driver-qemu, daemon-driver-lxc): Unconditionally require libvirt-daemon-driver-network. (daemon): Unconditionally include lock-driver files. --- libvirt.spec.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d095eac1c0..541aedebf5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -824,9 +824,7 @@ Summary: Qemu driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} # There really is a hard cross-driver dependency here -%if %{with_driver_modules} Requires: libvirt-daemon-driver-network = %{version}-%{release} -%endif %description daemon-driver-qemu The qemu driver plugin for the libvirtd daemon, providing @@ -841,9 +839,7 @@ Summary: LXC driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} # There really is a hard cross-driver dependency here -%if %{with_driver_modules} Requires: libvirt-daemon-driver-network = %{version}-%{release} -%endif %description daemon-driver-lxc The LXC driver plugin for the libvirtd daemon, providing @@ -1745,10 +1741,8 @@ fi %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %endif -%if %{with_libvirtd} %dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so -%endif %if %{with_qemu} %{_datadir}/augeas/lenses/libvirtd_qemu.aug -- GitLab