From 958f0e1daa1ce37cf5990ecd3d63c3b835365217 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Oct 22 2019 23:08:02 +0000
Subject: Upgrade to Vagrant 2.2.6


also fix i18n dependency to allow for v1.7.0.

---

diff --git a/sources b/sources
index 73a07f1..9bf74d3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vagrant-2.2.5.tar.gz) = dc95e566588987b9199e66ee5f548be573bd62e229d2e4de5447f43f25a1a7129377935ec6dc73cc1f53acc29c08b0a4fabebf1a58310f175cc6d37b856c9272
+SHA512 (vagrant-2.2.6.tar.gz) = 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a
 SHA512 (vagrant-spec-abfc34474d122235d56e4c6b6fb5d3e35bedfa90.tar.gz) = cbb60d661d34b37bc5d414da0b2a31f39e2910c11251e334da5efbd8f010b5bd428bc1ae476fcb9b42ec4e8f8c6265292ba3f8f543625178ecb85aad06e8856f
diff --git a/vagrant.spec b/vagrant.spec
index 53d46c9..1070a03 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -5,7 +5,7 @@
 %bcond_without help2man
 
 Name: vagrant
-Version: 2.2.5
+Version: 2.2.6
 Release: 1%{?dist}
 Summary: Build and distribute virtualized development environments
 License: MIT
@@ -39,7 +39,7 @@ Requires: ruby
 Requires: rubygem(hashicorp-checkpoint) >= 0.1.5
 Requires: rubygem(childprocess) >= 0.5.0
 Requires: rubygem(erubis) >= 2.7.0
-Requires: rubygem(i18n) >= 1.1.0
+Requires: (rubygem(i18n) >= 1.1.1 with rubygem(i18n) < 2.0)
 Requires: rubygem(json)
 Requires: rubygem(listen) >= 3.1.5
 Requires: rubygem(log4r) >= 1.1.9
@@ -142,6 +142,11 @@ sed -i '/^\s*command(:login) do$/,/\s*end$/ s/^/#/g' plugins/commands/login/plug
 %gemspec_remove_dep -s %{name}.gemspec -g rubyzip '~> 1.2.2'
 %gemspec_add_dep -s %{name}.gemspec -g rubyzip
 
+# Allow newer i18n version
+# https://github.com/hashicorp/vagrant/pull/11146
+%gemspec_remove_dep -s %{name}.gemspec -g i18n '~> 1.1.1'
+%gemspec_add_dep -s %{name}.gemspec -g i18n
+
 # Remove optional dependencies
 %gemspec_remove_dep -s %{name}.gemspec -g ed25519
 %gemspec_remove_dep -s %{name}.gemspec -g bcrypt_pbkdf
@@ -243,6 +248,9 @@ sed -i '/^\s*it "adds from FTP URL" do$/ a skip' test/unit/vagrant/action/builti
 sed -i '/^    it "generates a network name and configuration" do$/,/^    end/ s/^/#/' \
   test/unit/plugins/providers/docker/action/prepare_networks_test.rb
 
+# Remove failing BSD-host tests, as we don't care about those.
+rm -rf test/unit/plugins/hosts/bsd
+
 # Rake solves the requires issues for tests
 rake -f tasks/test.rake test:unit
 
@@ -357,6 +365,8 @@ end
 %{vagrant_plugin_instdir}/vagrant-spec.config.example.rb
 
 %changelog
+* Tue Oct 15 2019 Pavel Valena <pvalena@redhat.com> - 2.2.6-1
+- Upgrade to Vagrant 2.2.6.
 - Move man pages to main package
 
 * Wed Aug 14 2019 Pavel Valena <pvalena@redhat.com> - 2.2.5-1