-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-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel
+libvirt-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel
+libvirt-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel
+libvirt-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
+ifeq "$(DISTRONAME)" "f16"
+libvirt-DEVEL-RPMS += libnl-devel libudev-devel
+endif
+# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
+ifeq "$(DISTRONAME)" "f18"
+libvirt-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
+libvirt-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6
+endif
+libvirt-RPMFLAGS := --define 'packager PlanetLab'