From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 27 Mar 2014 13:45:01 +0000 (+0100)
Subject: rvm-ruby does not build on f20 either
X-Git-Tag: 5.3.3~1
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=6339d229aab55c9fb4d3131d1bafea1fead58d5b

rvm-ruby does not build on f20 either
---

diff --git a/config.planetlab/sliceimage-omf.pkgs b/config.planetlab/sliceimage-omf.pkgs
index f541a514..f7cc2af6 100644
--- a/config.planetlab/sliceimage-omf.pkgs
+++ b/config.planetlab/sliceimage-omf.pkgs
@@ -5,4 +5,4 @@ groupdesc: rvm and pre-installed ruby for easily deploying omf-rc as a gem
 # changes in openssl - see lxc.mk
 # however it's best to define a valid extension here because otherwise
 # the omf sliceimage is not known, and slices cannot be instantiated
-package>=f20: rvm-ruby
+package>=f22: rvm-ruby
diff --git a/lxc.mk b/lxc.mk
index e4c3b19b..a6e86e7d 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -370,9 +370,9 @@ IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
 #
-# for OMF resource controller as  a gem : rvm-ruby has right version of ruby and related gem stuff
+# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff
 #
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18)"
+ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
 rvm-ruby-MODULES := rvm-ruby
 rvm-ruby-SPEC := rpm/rvm-ruby.spec
 rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel