Hello community, here is the log from the commit of package vagrant for openSUSE:Factory checked in at 2020-05-19 14:49:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant (Old) and /work/SRC/openSUSE:Factory/.vagrant.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant" Tue May 19 14:49:05 2020 rev:24 rq:807078 version:2.2.9 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2020-05-14 23:25:57.133132571 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant.new.2738/vagrant.changes 2020-05-19 14:49:08.956158570 +0200 @@ -1,0 +2,5 @@ +Mon May 18 14:17:46 UTC 2020 - Dan Čermák <[email protected]> + +- Use the correct ruby in the vagrant binstub as well + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ --- /var/tmp/diff_new_pack.QhnbFh/_old 2020-05-19 14:49:10.228161391 +0200 +++ /var/tmp/diff_new_pack.QhnbFh/_new 2020-05-19 14:49:10.228161391 +0200 @@ -306,18 +306,21 @@ # the actual vagrant binary generated from the binstub install -D -m 755 %{SOURCE96} %{buildroot}%{_bindir}/vagrant -sed -i 's|@vagrant_embedded_dir@|%{vagrant_embedded_dir}|' %{buildroot}%{_bindir}/vagrant gem_path=$(ruby.%{rb_ruby_suffix} -e "print Gem.path.reject{|path| path.include? 'home'}.join(':')") -sed -i "s|@ruby_vagrant_gem_path@|$gem_path:%{vagrant_plugin_dir}|" %{buildroot}%{_bindir}/vagrant +sed -i -e "s|@vagrant_embedded_dir@|%{vagrant_embedded_dir}|" \ + -e "s|@ruby_vagrant_gem_path@|$gem_path:%{vagrant_plugin_dir}|" \ + -e "s|@vagrant_rb_ruby_suffix@|%{vagrant_rb_ruby_suffix}|" \ + %{buildroot}%{_bindir}/%{name} # install the rpm macros & expand the name, name-version and vagrant_rb_* macros %global macros_vagrant %{_rpmconfigdir}/macros.d/macros.%{name} install -D -m 0644 %{SOURCE97} %{buildroot}%{macros_vagrant} -sed -i "s|%%{name}|%{name}|" %{buildroot}%{macros_vagrant} -sed -i "s|%{name}-%%{version}|%{name}-%{version}|" %{buildroot}%{macros_vagrant} -sed -i "s|%%{rb_build_versions}|%{rb_build_versions}|" %{buildroot}%{macros_vagrant} -sed -i "s|%%{rb_build_abi}|%{rb_build_abi}|" %{buildroot}%{macros_vagrant} -sed -i "s|%%{rb_ruby_suffix}|%{rb_ruby_suffix}|" %{buildroot}%{macros_vagrant} +sed -i -e "s|%%{name}|%{name}|" \ + -e "s|%{name}-%%{version}|%{name}-%{version}|" \ + -e "s|%%{rb_build_versions}|%{rb_build_versions}|" \ + -e "s|%%{rb_build_abi}|%{rb_build_abi}|" \ + -e "s|%%{rb_ruby_suffix}|%{rb_ruby_suffix}|" \ + %{buildroot}%{macros_vagrant} # install post, transfiletrigerin & transfiletriggerun scriptlets %global post_rb %{vagrant_embedded_dir}/bin/vagrant_post.rb ++++++ binstub ++++++ --- /var/tmp/diff_new_pack.QhnbFh/_old 2020-05-19 14:49:10.296161542 +0200 +++ /var/tmp/diff_new_pack.QhnbFh/_new 2020-05-19 14:49:10.296161542 +0200 @@ -57,5 +57,4 @@ export VAGRANT_DISABLE_VBOXSYMLINKCREATE # Call the actual Vagrant bin with our arguments -exec ruby "${VAGRANT_EXECUTABLE}" "$@" - +exec /usr/bin/ruby.@vagrant_rb_ruby_suffix@ "${VAGRANT_EXECUTABLE}" "$@"
