100 lines
2.6 KiB
Diff
100 lines
2.6 KiB
Diff
From 775581ead9c0b6435e8a0dad2a6838909638e7b6 Mon Sep 17 00:00:00 2001
|
|
From: Eric Blake <eblake@redhat.com>
|
|
Date: Wed, 23 Mar 2011 10:30:49 -0600
|
|
Subject: [PATCH 5/6] rpm: add missing dependencies
|
|
|
|
manually adapted from upstream 206fc979b1656722b254e683d89b3e9fc4480c63
|
|
|
|
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 Build and BuildRequires for radvd
|
|
(BuildRequires): Add libxslt and augeas for docs and test.
|
|
(with_libvirtd): Add module-init-tools for modprobe.
|
|
(with_nwfilter): Add BuildRequires for ebtables.
|
|
---
|
|
libvirt.spec.in | 26 ++++++++++++++++++++++++--
|
|
1 files changed, 24 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libvirt.spec.in b/libvirt.spec.in
|
|
index 23f4525..8ffb757 100644
|
|
--- a/libvirt.spec.in
|
|
+++ b/libvirt.spec.in
|
|
@@ -219,15 +219,21 @@ Requires: %{name}-client = %{version}-%{release}
|
|
# daemon is present
|
|
%if %{with_libvirtd}
|
|
Requires: bridge-utils
|
|
+# for modprobe of pci devices
|
|
+Requires: module-init-tools
|
|
+# for /sbin/ip
|
|
+Requires: iproute
|
|
%endif
|
|
%if %{with_network}
|
|
Requires: dnsmasq >= 2.41
|
|
+Requires: radvd
|
|
+%endif
|
|
+%if %{with_network} || %{with_nwfilter}
|
|
Requires: iptables
|
|
+Requires: iptables-ipv6
|
|
%endif
|
|
%if %{with_nwfilter}
|
|
Requires: ebtables
|
|
-Requires: iptables
|
|
-Requires: iptables-ipv6
|
|
%endif
|
|
# needed for device enumeration
|
|
%if %{with_hal}
|
|
@@ -295,10 +301,15 @@ BuildRequires: xmlrpc-c-devel >= 1.14.0
|
|
%endif
|
|
BuildRequires: libxml2-devel
|
|
BuildRequires: xhtml1-dtds
|
|
+BuildRequires: libxslt
|
|
BuildRequires: readline-devel
|
|
BuildRequires: ncurses-devel
|
|
BuildRequires: gettext
|
|
BuildRequires: gnutls-devel
|
|
+%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
|
+# for augparse, optionally used in testing
|
|
+BuildRequires: augeas
|
|
+%endif
|
|
%if %{with_hal}
|
|
BuildRequires: hal-devel
|
|
%endif
|
|
@@ -323,8 +334,15 @@ BuildRequires: libselinux-devel
|
|
%endif
|
|
%if %{with_network}
|
|
BuildRequires: dnsmasq >= 2.41
|
|
+BuildRequires: iptables
|
|
+BuildRequires: iptables-ipv6
|
|
+BuildRequires: radvd
|
|
+%endif
|
|
+%if %{with_nwfilter}
|
|
+BuildRequires: ebtables
|
|
%endif
|
|
BuildRequires: bridge-utils
|
|
+BuildRequires: module-init-tools
|
|
%if %{with_sasl}
|
|
BuildRequires: cyrus-sasl-devel
|
|
%endif
|
|
@@ -388,7 +406,11 @@ BuildRequires: libssh2-devel
|
|
BuildRequires: netcf-devel >= 0.1.4
|
|
%endif
|
|
%if %{with_esx}
|
|
+%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
|
|
BuildRequires: libcurl-devel
|
|
+%else
|
|
+BuildRequires: curl-devel
|
|
+%endif
|
|
%endif
|
|
%if %{with_audit}
|
|
BuildRequires: audit-libs-devel
|
|
--
|
|
1.7.3.4
|
|
|