X-Git-Url: http://git.onelab.eu/?p=libvirt.git;a=blobdiff_plain;f=libvirt.spec;h=e54b59a62cd7af431030be173417e640b4784415;hp=2d9814aedcb29bec046ffbb95d50aa9a8cf5e269;hb=76b3759b9e2d513bbf518e1090c297a376b6b895;hpb=34a8db856dee675ed3cc8040badc086ebbdfd0a1

diff --git a/libvirt.spec b/libvirt.spec
index 2d9814a..e54b59a 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -3,13 +3,14 @@
 %define mainstream_version 1.2.1
 %define module_version_varname mainstream_version
 %define taglevel 0
+%define packager PlanetLab/OneLab
 
 #libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
 ##                       --without storage-fs --without storage-lvm \
 ##                       --without polkit --without sasl --without audit --with capng --with udev \
 ##                       --without netcf --without avahi --without sanlock \
 ##                       --without xen --without qemu --without hyperv --without phyp --without esx \
-##                       --without libxl \
+##                       --without libxl --without vbox \
 %define _without_storage_disk   true
 %define _without_storage_iscsi  true
 %define _without_storage_fs     true
@@ -17,8 +18,6 @@
 %define _without_polkit         true
 %define _without_sasl           true
 %define _without_audit          true
-#interface requires netcf
-#%define _without_netcf         true
 %define _without_avahi          true
 %define _without_sanlock        true
 %define _without_xen            true
@@ -28,7 +27,7 @@
 %define _without_esx            true
 %define _without_libxl          true
 %define _without_vbox           true
-
+%define _without_uml		true
 
 #turn this off even on f18 as an attempt to get back /proc/meminfo
 %define _without_fuse           true
@@ -273,11 +272,6 @@
     %define with_hal       0%{!?_without_hal:%{server_drivers}}
 %endif
 
-# interface requires netcf
-%if ! 0%{?with_netcf}
-    %define with_interface     0
-%endif
-
 # Enable yajl library for JSON mode with QEMU
 %if 0%{?fedora} >= 13 || 0%{?rhel} >= 6
     %define with_yajl     0%{!?_without_yajl:%{server_drivers}}
@@ -449,7 +443,9 @@ Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
         %endif
 
+	%if %{with_interface}
 Requires: libvirt-daemon-driver-interface = %{version}-%{release}
+	%endif
 Requires: libvirt-daemon-driver-secret = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage = %{version}-%{release}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@ -743,6 +739,7 @@ Summary: Default configuration files for the libvirtd daemon
 Group: Development/Libraries
 
 Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-driver-network = %{version}-%{release}
 
 %description daemon-config-network
 Default configuration files for setting up NAT based networking
@@ -1542,6 +1539,12 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/libvirtd.conf
 rm -fr %{buildroot}
 
 %check
+# PlanetLab build
+# do not run tests, this is mainstream business, and more importantly
+# our own setup is ti build inside a container already and we've seen
+# occasional red herrings because of that
+exit
+#
 cd tests
 make
 # These tests don't current work in a mock build root