On Wed, May 05, 2010 at 11:57:01AM -0400, Stefan Berger wrote:
Add ebtables,iptables & iptables-ipv6 dependency to rpm.
Changes from V1 to V2:
-passing --without-libpcap to configure script, if libpcap is not to be used
Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>
---
libvirt.spec.in | 7 +++++++
1 file changed, 7 insertions(+)
Index: libvirt-acl/libvirt.spec.in
===================================================================
--- libvirt-acl.orig/libvirt.spec.in
+++ libvirt-acl/libvirt.spec.in
@@ -61,6 +61,7 @@
%define with_udev 0%{!?_without_udev:0}
%define with_hal 0%{!?_without_hal:0}
%define with_yajl 0%{!?_without_yajl:0}
+%define with_nwfilter 0%{!?_without_nwfilter:0}
%define with_libpcap 0%{!?_without_libpcap:0}
# Non-server/HV driver defaults which are always enabled
@@ -150,6 +151,7 @@
# Enable libpcap library
%if %{with_qemu}
+%define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}}
%define with_libpcap 0%{!?_without_libpcap:%{server_drivers}}
%endif
@@ -195,6 +197,11 @@ Requires: bridge-utils
Requires: dnsmasq
Requires: iptables
%endif
+%if %{with_nwfilter}
+Requires: ebtables
+Requires: iptables
+Requires: iptables-ipv6
+%endif
# needed for device enumeration
%if %{with_hal}
Requires: hal
@@ -517,6 +524,10 @@ of recent versions of Linux (and other O
%define _without_yajl --without-yajl
%endif
+%if ! %{with_libpcap}
+%define _without_libpcap --without-libpcap
+%endif
+
%configure %{?_without_xen} \
%{?_without_qemu} \
%{?_without_openvz} \
@@ -545,6 +556,7 @@ of recent versions of Linux (and other O
%{?_without_hal} \
%{?_without_udev} \
%{?_without_yajl} \
+ %{?_without_libpcap} \
--with-qemu-user=%{qemu_user} \
--with-qemu-group=%{qemu_group} \
--with-init-script=redhat \
ACK, looks fine
Daniel
--
|: Red Hat, Engineering, London -o-
http://people.redhat.com/berrange/ :|
|:
http://libvirt.org -o-
http://virt-manager.org -o-
http://deltacloud.org :|
|:
http://autobuild.org -o-
http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|