From: Thierry Parmentelat Date: Thu, 9 Dec 2010 11:27:58 +0000 (+0100) Subject: skip ejabberd on f12 as well, it's not useful anyway as the stock X-Git-Tag: 5.0-rc17~12 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=05a232d23dac956febcf0c6fef1d4dfe55baa277;p=build.git skip ejabberd on f12 as well, it's not useful anyway as the stock version is 2.1.5 that's higher than ours 2.1.3 --- diff --git a/onelab.mk b/onelab.mk index b4099cba..29a2e459 100644 --- a/onelab.mk +++ b/onelab.mk @@ -362,8 +362,9 @@ ALL += pyaspects ejabberd-MODULES := ejabberd ejabberd-SPEC := ejabberd.spec ejabberd-BUILD-FROM-SRPM := yes -# tmp - skip on f14 for now -ifneq ($(DISTRONAME),f14) +# 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