diff --git a/vagrant-2.2.9-Relax-Ruby-dependency-restriction.patch b/vagrant-2.2.9-Relax-Ruby-dependency-restriction.patch new file mode 100644 index 0000000..a167e16 --- /dev/null +++ b/vagrant-2.2.9-Relax-Ruby-dependency-restriction.patch @@ -0,0 +1,10 @@ +--- a/vagrant.gemspec ++++ b/vagrant.gemspec +@@ -12,7 +12,6 @@ + s.summary = "Build and distribute virtualized development environments." + s.description = "Vagrant is a tool for building and distributing virtualized development environments." + +- s.required_ruby_version = "~> 2.5", "< 2.8" + s.required_rubygems_version = ">= 1.3.6" + + s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" diff --git a/vagrant.spec b/vagrant.spec index 7424d1a..a679299 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -36,6 +36,10 @@ Patch3: vagrant-2.2.10-Updates-to-address-all-Ruby-deprecations-and-warnings.pat # Fix rspec-mocks 3.10.1+ compatibility. # https://github.com/hashicorp/vagrant/pull/12145 Patch4: vagrant-2.2.9-Use-test-doubles-instead-of-true.patch +# Relax Ruby version restriction (use patch to make sure we don't regress +# if upstream fixes this. +# https://bugzilla.redhat.com/show_bug.cgi?id=1915671 +Patch5: vagrant-2.2.9-Relax-Ruby-dependency-restriction.patch # The load directive is supported since RPM 4.12, i.e. F21+. The build process # fails on older Fedoras. @@ -122,6 +126,7 @@ Documentation for %{name}. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build # TODO: package vagrant_cloud, as it is not in Fedora yet @@ -443,6 +448,8 @@ end * Wed Jan 20 2021 Vít Ondruch - 2.2.9-5 - Fix Ruby 3.0 and rspec-mock 3.10.1 compatibility. - Relax net-ssh dependency. +- Relax Ruby version restriction. + Resolves: rhbz#1915671 * Mon Aug 17 2020 Vít Ondruch - 2.2.9-4 - Use Erubi instead of Erubis.