-# xxx temporarily turning this off on f20 and f21
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f20 f21)"
-fprobe-ulog-MODULES := fprobe-ulog
-fprobe-ulog-SPEC := fprobe-ulog.spec
-ALL += fprobe-ulog
-IN_NODEIMAGE += fprobe-ulog
-endif
-
-#################### libvirt version selection
-# settling with using version 1.2.1 on all fedoras
-# although this does not solve the slice re-creation issue seen on f20
-
-local_libvirt=true
-separate_libvirt_python=true
-
-#
-# libvirt
-#
-ifeq "$(local_libvirt)" "true"
-
-libvirt-MODULES := libvirt
-libvirt-SPEC := libvirt.spec
-libvirt-BUILD-FROM-SRPM := yes
-# The --without options are breaking spec2make : hard-wired in the specfile instead
-libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds
-libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel
-libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel
-libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
-# for 1.2.1 - first seen on f20, not sure for the other ones
-libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
-# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
-libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
-libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
-# 1.2.11
-libvirt-STOCK-DEVEL-RPMS += wireshark-devel
-libvirt-STOCK-DEVEL-RPMS += ceph-devel-compat
-ALL += libvirt
-IN_NODEREPO += libvirt
-IN_NODEIMAGE += libvirt
-
-endif
-
-#
-## libvirt-python
-#
-ifeq "$(separate_libvirt_python)" "true"
-
-libvirt-python-MODULES := libvirt-python
-libvirt-python-SPEC := libvirt-python.spec
-libvirt-python-BUILD-FROM-SRPM := yes
-libvirt-python-STOCK-DEVEL-RPMS += pm-utils
-# for 1.2.11
-libvirt-python-STOCK-DEVEL-RPMS += python-nose
-# it would make sense to do something like this if we wanted to
-# build against python3 as well, but for now I turned this feature off
-# in libvirt-python
-#ifeq "$(distro)" "Fedora"
-#xxx if $(distrorelease) > 18
-#libvirt-python-STOCK-DEVEL-RPMS += python3-devel python3-nose python3-lxml
-#endif
-#endif
-libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
-libvirt-python-RPMFLAGS := --define 'packager PlanetLab'
-ALL += libvirt-python
-IN_NODEREPO += libvirt-python
-IN_NODEIMAGE += libvirt-python
-
-endif