X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rpm%2Frvm-ruby.spec;h=06e24fde8709f38896cf9080ed3d5131bf2e15fc;hb=a4cba47648a8dfef02e9ea3a13ceecdbb7afaaa5;hp=6a40fba1b9b3dbdf928f8fc662b311ec9b9d28d4;hpb=dd9e51a7d0e62d03820d04c54bdc9400c49b1d92;p=rvm-ruby.git diff --git a/rpm/rvm-ruby.spec b/rpm/rvm-ruby.spec index 6a40fba..06e24fd 100644 --- a/rpm/rvm-ruby.spec +++ b/rpm/rvm-ruby.spec @@ -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 4 +%define taglevel 6 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} Summary: Ruby Version Manager (including Rubies and Gems) @@ -28,7 +28,8 @@ Requires(pre): shadow-utils # For rvm Requires: bash curl git # Basics for building ruby 1.8/1.9 -Requires: gcc-c++ patch readline readline-devel zlib-devel libyaml-devel libffi-devel openssl-devel autoconf automake libtool bison +# We expect all the building to take place .. at build-time, so let's take this out +#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 @@ -117,7 +118,9 @@ gemi='gem install --no-ri --no-rdoc' ruby_tag=ruby-1.9.3-p286 rvm install $ruby_tag rvm use $ruby_tag -$gemi bundler +rvm gemset create omf +rvm use $ruby_tag@omf +$gemi omf_rc #$gemi whatever_gem_you_need #ruby_tag=ruby-1.8.7-p352 @@ -166,7 +169,7 @@ for f in $(find $br -type l); do # call readlink with -f so all symlinmks are solved # and so we can reliably substitute $brc that is also canonicalized destc=$(readlink -f $f | sed -e "s,^$brc,,") - ls -sfn $destc $f + ln -sfn $destc $f fi done @@ -191,6 +194,9 @@ exit 0 %{_mandir}/man1/* %changelog +* Tue Jun 25 2013 Thierry Parmentelat - rvm-ruby-1.20.10-6 +- add omf-rc in the mix + * Fri May 18 2013 Christoph Dwertmann - 4.xxx - downloads RVM instead of relying on local sources - works with latest RVM and Fedora