diff options
| -rw-r--r-- | vagrant-1.6.5-fix-dependencies.patch | 3 | ||||
| -rw-r--r-- | vagrant.spec | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/vagrant-1.6.5-fix-dependencies.patch b/vagrant-1.6.5-fix-dependencies.patch index 1e23f2d..91e7771 100644 --- a/vagrant-1.6.5-fix-dependencies.patch +++ b/vagrant-1.6.5-fix-dependencies.patch @@ -63,9 +63,10 @@ index c4131b2..638aeb4 100644 s.rubyforge_project = "vagrant" - s.add_dependency "bundler", ">= 1.5.2", "< 1.7.0" +- s.add_dependency "childprocess", "~> 0.5.0" + # https://github.com/mitchellh/vagrant/issues/4500 + s.add_dependency "bundler", ">= 1.5.2", "!= 1.7.0" - s.add_dependency "childprocess", "~> 0.5.0" ++ s.add_dependency "childprocess", ">= 0.3.9" s.add_dependency "erubis", "~> 2.7.0" - s.add_dependency "i18n", "~> 0.6.0" - s.add_dependency "listen", "~> 2.7.1" diff --git a/vagrant.spec b/vagrant.spec index b29d56f..afe3da8 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -35,7 +35,7 @@ Requires: ruby Requires: rubygem(rb-inotify) Requires: rubygem(bundler) >= 1.5.2 Requires: rubygem(hashicorp-checkpoint) >= 0.1.1 -Requires: rubygem(childprocess) >= 0.5.0 +Requires: rubygem(childprocess) >= 0.3.9 Requires: rubygem(erubis) >= 2.7.0 Requires: rubygem(i18n) >= 0.6.0 Requires: rubygem(listen) >= 0.4.7 @@ -140,6 +140,9 @@ sed -i '/git/ s/^/#/' ../vagrant-spec/vagrant-spec.gemspec # Relax the thor dependency, since Fedora ships with newer version. sed -i '/thor/ s/~>/>=/' ../vagrant-spec/vagrant-spec.gemspec +# fix dependency... +sed -i '/childprocess/ s/~> 0.5.0/>= 0.3.9/' ../vagrant-spec/vagrant-spec.gemspec + # TODO: winrm is not in Fedora yet. rm -rf test/unit/plugins/communicators/winrm sed -i '/it "eager loads WinRM" do/,/^ end$/ s/^/#/' test/unit/vagrant/machine_test.rb |