### the madwifi drivers ahip with fedora16's kernel rpm
+#
+# lxctools: scripts for entering containers
+#
+lxctools-MODULES := lxctools
+lxctools-SPEC := lxctools.spec
+ALL += lxctools
+IN_NODEIMAGE += lxctools
+
+#
+# lxcsu: root context module for entering namespaces
+#
+lxcsu-MODULES := lxcsu
+lxcsu-SPEC := lxcsu.spec
+ALL += lxcsu
+IN_NODEIMAGE += lxcsu
+
+#
#
# transforward: root context module for transparent port forwarding
#
ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
-#################### libvirt on f16 is too old, sounds like f17 has something fine
-local_libvirt=false
-ifeq "$(DISTRONAME)" "f16"
+#################### using our own libvirt on all distros for now
+#local_libvirt=false
+#ifeq "$(DISTRONAME)" "f16"
local_libvirt=true
-endif
+#endif
ifeq "$(local_libvirt)" "true"
#
libvirt-MODULES := libvirt
libvirt-SPEC := libvirt.spec
libvirt-BUILD-FROM-SRPM := yes
-libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel gettext
-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
-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 : hard-wired in the specfile instead
+#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-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel gettext
+#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
+# added for 0.10.2
+#libvirt-DEVEL-RPMS += xen-devel sanlock-devel avahi-devel cyrus-sasl-devel polkit qemu-img lvm2
+#libvirt-DEVEL-RPMS += iscsi-initiator-utils parted-devel libssh2-devel netcf-devel libwsman-devel
+#libvirt-DEVEL-RPMS += audit-libs-devel nfs-utils libblkid-devel
+# added for 1.0.2 on f16+f18
+#libvirt-DEVEL-RPMS += libattr-devel libssh2-devel
+# added for 1.0.2 on f18
+#ifneq "$(DISTRONAME)" "f16"
+#libvirt-devel-RPMS" += libnl3-devel fuse-devel dbus-devel numad
+#endif
+libvirt-RPMFLAGS := --define 'packager PlanetLab'
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
# plcapi
#
plcapi-MODULES := plcapi
-plcapi-SPEC := PLCAPI.spec
+plcapi-SPEC := plcapi.spec
ALL += plcapi
IN_MYPLC += plcapi