From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sat, 13 Jul 2013 22:31:42 +0000 (+0200)
Subject: Merge branch 'planetlab' of github.com:cdwertmann/rvm-rpm into planetlab
X-Git-Tag: rvm-ruby-1.20.10-8
X-Git-Url: http://git.onelab.eu/?p=rvm-ruby.git;a=commitdiff_plain;h=3191e8311daff527059f54c44bffb34601988ab9;hp=-c

Merge branch 'planetlab' of github.com:cdwertmann/rvm-rpm into planetlab
---

3191e8311daff527059f54c44bffb34601988ab9
diff --combined rpm/rvm-ruby.spec
index 5c89b4d,34542bb..c4c36d2
--- a/rpm/rvm-ruby.spec
+++ b/rpm/rvm-ruby.spec
@@@ -8,7 -8,7 +8,7 @@@
  %define name rvm-ruby
  # pick a RVM version from https://github.com/wayneeseguin/rvm/tags
  %define version 1.20.10
 -%define taglevel 7
 +%define taglevel 8
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
  Summary: Ruby Version Manager (including Rubies and Gems)
@@@ -23,6 -23,8 +23,8 @@@ BuildRoot: %{_tmppath}/%{name}-%{versio
  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 +34,8 @@@ Requires: bash curl gi
  #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
@@@ -119,7 -123,7 +123,7 @@@ ruby_tag=ruby-1.9.3-p28
  rvm install $ruby_tag
  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,11 -198,6 +198,11 @@@ exit 
  %{_mandir}/man1/*
  
  %changelog
 +* 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