X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rpm%2Frvm-ruby.spec;h=3a9e3a481ea330a9c01fbca004bdcbf1f3d6fb3a;hb=HEAD;hp=06e24fde8709f38896cf9080ed3d5131bf2e15fc;hpb=a4cba47648a8dfef02e9ea3a13ceecdbb7afaaa5;p=rvm-ruby.git

diff --git a/rpm/rvm-ruby.spec b/rpm/rvm-ruby.spec
index 06e24fd..3a9e3a4 100644
--- a/rpm/rvm-ruby.spec
+++ b/rpm/rvm-ruby.spec
@@ -7,8 +7,8 @@
 # PL conventions
 %define name rvm-ruby
 # pick a RVM version from https://github.com/wayneeseguin/rvm/tags
-%define version 1.20.10
-%define taglevel 6
+%define version 1.22.9
+%define taglevel 1
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Summary: Ruby Version Manager (including Rubies and Gems)
@@ -23,6 +23,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 BuildRequires: bash curl git
 BuildRequires: gcc-c++ patch chrpath readline readline-devel zlib-devel libyaml-devel libffi-devel openssl-devel autoconf automake libtool bison
 BuildRequires: sed grep tar gzip bzip2 make file
+# for OMF:
+BuildRequires: tar libxml2 libxml2-devel libxslt libxslt-devel
 
 Requires(pre): shadow-utils
 # For rvm
@@ -32,6 +34,8 @@ Requires: bash curl git
 #Requires: gcc-c++ patch readline readline-devel zlib-devel libyaml-devel libffi-devel openssl-devel autoconf automake libtool bison
 # Used by the scripts
 Requires: sed grep tar gzip bzip2 make file
+# for OMF:
+Requires: libxml2 libxslt
 
 %description
 RVM is the Ruby Version Manager. It manages Ruby interpreter environments
@@ -116,10 +120,10 @@ source ${rvm_path}/scripts/rvm
 gemi='gem install --no-ri --no-rdoc'
 
 ruby_tag=ruby-1.9.3-p286
-rvm install $ruby_tag
+rvm install $ruby_tag --verify-downloads 1
 rvm use $ruby_tag
 rvm gemset create omf
-rvm use $ruby_tag@omf
+rvm use $ruby_tag@omf --default
 $gemi omf_rc
 #$gemi whatever_gem_you_need
 
@@ -194,6 +198,14 @@ exit 0
 %{_mandir}/man1/*
 
 %changelog
+* Fri Sep 20 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - rvm-ruby-1.22.9-1
+- move to version 1.22.9
+
+* Sun Jul 14 2013 Thierry Parmentelat - rvm-ruby-1.20.10-8
+- create an omf gemset (in rvm-ruby-1.20.10-7)
+- make omf the default gemset
+- add libxml2 and lixslt dependencies for omf
+
 * Tue Jun 25 2013 Thierry Parmentelat - rvm-ruby-1.20.10-6
 - add omf-rc in the mix