ALL += fprobe-ulog
IN_NODEIMAGE += fprobe-ulog
-#################### using our own libvirt on f18, and the stock version later on
-local_libvirt=false
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
+#################### 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
-endif
+separate_libvirt_python=true
-ifeq "$(local_libvirt)" "true"
#
# libvirt
#
+ifeq "$(local_libvirt)" "true"
+
libvirt-MODULES := libvirt
libvirt-SPEC := libvirt.spec
libvirt-BUILD-FROM-SRPM := yes
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
-
-ifeq "$(DISTRONAME)" "f16"
-libvirt-STOCK-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)" "$(filter $(DISTRONAME),f18 f20)"
libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
-libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel
-endif
-libvirt-RPMFLAGS := --define 'packager PlanetLab'
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel netcf-devel
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 += gnutls-utils nc pm-utils
+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
#
ALL += plcapi
IN_MYPLC += plcapi
-#
-# mod_python
-#
-# this was dropped in fedora18, at which point the intention has been to
-# move to wsgi instead; however our using wsgi currently looks unstable
-# so you have the option to install this manually, in which case myplc will
-# swap to using mod_python - see plc.d/httpd
-ifeq "$(DISTRO)" "Fedora"
-ifneq "$(DISTRONAME)" "f16"
-mod_python-MODULES := mod_python
-mod_python-SPEC := mod_python.spec
-mod_python-STOCK-DEVEL-RPMS := httpd-devel
-mod_python-BUILD-FROM-SRPM := yes
-ALL += mod_python
-endif
-endif
-
#
# drupal
#