From 02af3e5cd7a2e88f07866d2a30490f30272f0175 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: May 20 2020 17:42:24 +0000 Subject: Move dependency load map_command_options for creating @box_extra_download_options to config/vm.rb. This is needed to be able to run vagrant-libvirt test suite, f.e.. It resolves usecase when `bin/vagrant` executable is not used directly. https://github.com/hashicorp/vagrant/pull/11609 --- diff --git a/vagrant.spec b/vagrant.spec index 1a34739..5ade93c 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -6,7 +6,7 @@ Name: vagrant Version: 2.2.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Build and distribute virtualized development environments License: MIT URL: http://vagrantup.com @@ -151,8 +151,8 @@ sed -i '/^\s*command(:login) do$/,/\s*end$/ s/^/#/g' plugins/commands/login/plug # Load missing dependency Vagrant::Util::MapCommandOptions # https://github.com/hashicorp/vagrant/pull/11609 -sed -i "/^ require 'vagrant\/util\/experimental'$/ a\ require 'vagrant/util/map_command_options'" \ - bin/vagrant +sed -i '/^\s*require..vagrant.util.experimental.\s*$/ a\require "vagrant/util/map_command_options"' \ + plugins/kernel_v2/config/vm.rb gem build %{name}.gemspec @@ -420,6 +420,11 @@ end %{vagrant_plugin_instdir}/vagrant-spec.config.example.rb %changelog +* Wed May 20 2020 Pavel Valena - 2.2.9-2 +- Move dependency load map_command_options + for creating @box_extra_download_options to config/vm.rb. + https://github.com/hashicorp/vagrant/pull/11609 + * Mon May 11 2020 Pavel Valena - 2.2.9-1 - Update to Vagrant 2.2.9. Resolves: rhbz#1795460