From 69a0f3ee23404f7c15c23aa7185a7b09839d0105 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 28 Jul 2009 17:30:48 +0100 Subject: [PATCH] Enable netcf by default Disabled on < f12 for now until netcf is in Fedora updates BuildRequires netcf if enabled, pass --without-netcf if its disabled * libvirt.spec.in: enabled netcf by default --- libvirt.spec.in | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 18c87a2aa4..547d8e8d6f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -23,6 +23,7 @@ %define with_numactl 0%{!?_without_numactl:1} # default to off %define with_capng 0%{!?_without_capng:0} +%define with_netcf 0%{!?_without_netcf:1} # Xen is available only on i386 x86_64 ia64 %ifnarch i386 i586 i686 x86_64 ia64 @@ -48,6 +49,10 @@ %define with_capng 0%{!?_without_capng:1} %endif +%if 0%{?fedora} >= 12 +%define with_netcf 0%{!?_without_netcf:1} +%endif + %if 0%{?fedora} >= 12 %define qemu_user qemu %define qemu_group qemu @@ -183,6 +188,9 @@ BuildRequires: libcap-ng-devel >= 0.5.0 %if %{with_phyp} BuildRequires: libssh-devel >= 0.3.1 %endif +%if %{with_netcf} +BuildRequires: netcf-devel +%endif # Fedora build root suckage BuildRequires: gawk @@ -326,6 +334,10 @@ of recent versions of Linux (and other OSes). %define _without_capng --without-capng %endif +%if ! %{with_netcf} +%define _without_netcf --without-netcf +%endif + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -347,6 +359,7 @@ of recent versions of Linux (and other OSes). %{?_without_storage_disk} \ %{?_without_numactl} \ %{?_without_capng} \ + %{?_without_netcf} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-init-script=redhat \