rpm: add missing dependencies

Among others, the missing radvd dependency showed up as:

error: Failed to start network ipv6net
error: Cannot find radvd - Possibly the package isn't installed: No such file
or directory

even when radvd was installed, because the RADVD preprocessor
symbol was missing at configure time.

* libvirt.spec.in (with_network): Add BuildRequires for radvd,
iptables, and ip6tables.
(BuildRequires): Add libxslt and augeas for docs and test.
(with_libvirtd): Add module-init-tools for modprobe.
(with_nwfilter): Add BuildRequires for ebtables.
(with_esx): Fix esx build on RHEL 5, thanks to curl-devel rename.
This commit is contained in:
Eric Blake 2011-03-23 10:30:49 -06:00
parent 7ee06f334b
commit 206fc979b1

View File

@ -236,15 +236,21 @@ Requires: %{name}-client = %{version}-%{release}
# daemon is present # daemon is present
%if %{with_libvirtd} %if %{with_libvirtd}
Requires: bridge-utils Requires: bridge-utils
# for modprobe of pci devices
Requires: module-init-tools
# for /sbin/ip
Requires: iproute
%endif %endif
%if %{with_network} %if %{with_network}
Requires: dnsmasq >= 2.41 Requires: dnsmasq >= 2.41
Requires: radvd
%endif
%if %{with_network} || %{with_nwfilter}
Requires: iptables Requires: iptables
Requires: iptables-ipv6
%endif %endif
%if %{with_nwfilter} %if %{with_nwfilter}
Requires: ebtables Requires: ebtables
Requires: iptables
Requires: iptables-ipv6
%endif %endif
# needed for device enumeration # needed for device enumeration
%if %{with_hal} %if %{with_hal}
@ -313,10 +319,15 @@ BuildRequires: xmlrpc-c-devel >= 1.14.0
%endif %endif
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: xhtml1-dtds BuildRequires: xhtml1-dtds
BuildRequires: libxslt
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: gettext BuildRequires: gettext
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
# for augparse, optionally used in testing
BuildRequires: augeas
%endif
%if %{with_hal} %if %{with_hal}
BuildRequires: hal-devel BuildRequires: hal-devel
%endif %endif
@ -341,8 +352,15 @@ BuildRequires: libselinux-devel
%endif %endif
%if %{with_network} %if %{with_network}
BuildRequires: dnsmasq >= 2.41 BuildRequires: dnsmasq >= 2.41
BuildRequires: iptables
BuildRequires: iptables-ipv6
BuildRequires: radvd
%endif
%if %{with_nwfilter}
BuildRequires: ebtables
%endif %endif
BuildRequires: bridge-utils BuildRequires: bridge-utils
BuildRequires: module-init-tools
%if %{with_sasl} %if %{with_sasl}
BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-devel
%endif %endif
@ -406,7 +424,11 @@ BuildRequires: libssh2-devel
BuildRequires: netcf-devel >= 0.1.4 BuildRequires: netcf-devel >= 0.1.4
%endif %endif
%if %{with_esx} %if %{with_esx}
%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
%else
BuildRequires: curl-devel
%endif
%endif %endif
%if %{with_audit} %if %{with_audit}
BuildRequires: audit-libs-devel BuildRequires: audit-libs-devel