openvswitch-MODULES := openvswitch
openvswitch-SPEC := openvswitch.spec
openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-# maybe not in production yet
-#IN_NODEIMAGE += openvswitch
+
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
+IN_NODEIMAGE += openvswitch
ALL += openvswitch
+endif
#
# vsys
#
vsyssh-MODULES := vsys
vsyssh-SPEC := vsyssh.spec
-IN_SLIVER += vsyssh
+IN_SLICEIMAGE += vsyssh
ALL += vsyssh
#
pyaspects-BUILD-FROM-SRPM := yes
ALL += pyaspects
-#
-# ejabberd
-#
-ejabberd-MODULES := ejabberd
-ejabberd-SPEC := ejabberd.spec
-ejabberd-BUILD-FROM-SRPM := yes
-ejabberd-DEVEL-RPMS += erlang pam-devel hevea
-# not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
-# so, this is relevant on f8 and centos5 only
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
-ALL += ejabberd
-endif
-
# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model
build_sfa=true