X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rpm%2Frvm-ruby.spec;h=801cc139035653b542a31c204e802a306dc2ccbb;hb=bb71cbcb22500589b982ea16a3b85748fb328234;hp=7b705d8f1ce068f1cfd0e8927908b4f82cf701fd;hpb=c7dfde1c4e2664dd0b9fac82c2f49003a1d81587;p=rvm-ruby.git diff --git a/rpm/rvm-ruby.spec b/rpm/rvm-ruby.spec index 7b705d8..801cc13 100644 --- a/rpm/rvm-ruby.spec +++ b/rpm/rvm-ruby.spec @@ -60,7 +60,7 @@ export rvm_ignore_rvmrc=1 \ rvm_path="%{buildroot}%{rvm_dir}" \ rvm_man_path="%{buildroot}%{_mandir}" \ HOME=%{buildroot} -\curl -L https://get.rvm.io | bash -s stable --version %{release} +\curl -L https://get.rvm.io | bash -s stable --version %{version} ) # So members of the rvm group can write to it @@ -153,7 +153,11 @@ find $br -type f -print0 | xargs -0 sed -i "s,$br,$slashes,g" # Fix symlinks with bad path for f in $(find $br -type l |grep "$br"); do - ln -sfn $(readlink -f $f |sed "s,$br,,") $f +# original version read like this +# ln -sfn $(readlink -f $f |sed "s,$br,,") $f +# however in the PL environment, readlink transforms /longbuildroot into /build, +# and then sed fails to do its job, so readlink does not seem such a good idea + ln -sfn $(echo $f | sed "s,^$br,,") $f done find $br -maxdepth 1 -name '.*' -exec rm -rf {} \;