From 2c14e90d618af586b86a626cb37cc0d7814937c2 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Wed, 4 May 2016 16:44:27 +0100
Subject: [PATCH] libvirt.spec.in: remove macvtap conditional

Both RHEL and Fedora build with macvtap at all times.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 libvirt.spec.in | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index c2e486ef5f..a98d20db21 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -72,7 +72,6 @@
 
 # A few optional bits off by default, we enable later
 %define with_fuse          0%{!?_without_fuse:0}
-%define with_macvtap       0%{!?_without_macvtap:0}
 %define with_libnl         0%{!?_without_libnl:0}
 %define with_cgconfig      0%{!?_without_cgconfig:0}
 %define with_sanlock       0%{!?_without_sanlock:0}
@@ -181,8 +180,6 @@
 
 
 %if %{with_qemu} || %{with_lxc} || %{with_uml}
-    %define with_macvtap  0%{!?_without_macvtap:1}
-
 # numad is used to manage the CPU and memory placement dynamically,
 # it's not available on s390[x] and ARM.
     %ifnarch s390 s390x %{arm}
@@ -190,9 +187,7 @@
     %endif
 %endif
 
-%if %{with_macvtap}
-    %define with_libnl 1
-%endif
+%define with_libnl 1
 
 # Pull in cgroups config system
 %if %{with_qemu} || %{with_lxc}
@@ -1032,10 +1027,6 @@ rm -rf .git
     %define _without_sanlock --without-sanlock
 %endif
 
-%if ! %{with_macvtap}
-    %define _without_macvtap --without-macvtap
-%endif
-
 %if %{with_firewalld}
     %define _with_firewalld --with-firewalld
 %endif
@@ -1122,7 +1113,7 @@ rm -f po/stamp-po
            --with-yajl \
            %{?_without_sanlock} \
            --with-libpcap \
-           %{?_without_macvtap} \
+           --with-macvtap \
            --with-audit \
            --with-dtrace \
            --with-driver-modules \