From: Andy Bavier <acb@cs.princeton.edu>
Date: Thu, 17 Jan 2013 15:40:14 +0000 (-0500)
Subject: Stop breaking 'spec2make' when building libvirt
X-Git-Tag: 5.2.1~122^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=35dc4c47f6eeab27530292c3727efeef58c6850b;p=build.git

Stop breaking 'spec2make' when building libvirt
---

diff --git a/lxc.mk b/lxc.mk
index 14a2d60c..6bb9ba30 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -133,13 +133,14 @@ libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel
 libvirt-DEVEL-RPMS += python-devel libcap-ng-devel libpciaccess-devel radvd numactl-devel 
 libvirt-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas 
 libvirt-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub ceph-devel
-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 \
-	                --define 'packager PlanetLab'
+# The --without options are breaking spec2make
+#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 \
+libvirt-RPMFLAGS :=	--define 'packager PlanetLab'
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt