|
|
42da19c |
From 7486aa2ce950f55a4be9049d514c412d7e45ddef Mon Sep 17 00:00:00 2001
|
|
|
42da19c |
From: Pavel Valena <pvalena@redhat.com>
|
|
|
42da19c |
Date: Thu, 20 Jul 2017 15:01:06 +0200
|
|
|
42da19c |
Subject: [PATCH] Fix dependencies for Vagrant 1.9.7.
|
|
|
6788415 |
|
|
|
6788415 |
---
|
|
|
363de6e |
vagrant.gemspec | 23 +++++++++++++----------
|
|
|
363de6e |
1 file changed, 13 insertions(+), 10 deletions(-)
|
|
|
6788415 |
|
|
|
6788415 |
diff --git a/vagrant.gemspec b/vagrant.gemspec
|
|
|
42da19c |
index c92ca17..aeee52f 100644
|
|
|
6788415 |
--- a/vagrant.gemspec
|
|
|
6788415 |
+++ b/vagrant.gemspec
|
|
|
42da19c |
@@ -12,31 +12,34 @@ Gem::Specification.new do |s|
|
|
|
42da19c |
s.summary = "Build and distribute virtualized development environments."
|
|
|
42da19c |
s.description = "Vagrant is a tool for building and distributing virtualized development environments."
|
|
|
42da19c |
|
|
|
42da19c |
- s.required_ruby_version = "~> 2.2", "< 2.4"
|
|
|
42da19c |
+ s.required_ruby_version = "~> 2.2"
|
|
|
42da19c |
s.required_rubygems_version = ">= 1.3.6"
|
|
|
42da19c |
s.rubyforge_project = "vagrant"
|
|
|
42da19c |
|
|
|
42da19c |
- s.add_dependency "childprocess", "~> 0.6.0"
|
|
|
42da19c |
+ s.add_dependency "childprocess", "~> 0.5.0"
|
|
|
42da19c |
s.add_dependency "erubis", "~> 2.7.0"
|
|
|
42da19c |
s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
|
|
|
b899893 |
s.add_dependency "listen", "~> 3.1.5"
|
|
|
6788415 |
s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"
|
|
|
6788415 |
s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
|
|
|
42da19c |
- s.add_dependency "net-ssh", "~> 4.1.0"
|
|
|
42da19c |
+ s.add_dependency "net-ssh", ">= 4.1.0"
|
|
|
b899893 |
s.add_dependency "net-sftp", "~> 2.1"
|
|
|
42da19c |
- s.add_dependency "net-scp", "~> 1.2.0"
|
|
|
6788415 |
- s.add_dependency "rb-kqueue", "~> 0.2.0"
|
|
|
42da19c |
+ s.add_dependency "net-scp", ">= 1.2.0"
|
|
|
42da19c |
+ # Remove Windows specific dependency.
|
|
|
b899893 |
+ # s.add_dependency "rb-kqueue", "~> 0.2.0"
|
|
|
b899893 |
s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
|
|
|
6788415 |
- s.add_dependency "wdm", "~> 0.1.0"
|
|
|
42da19c |
- s.add_dependency "winrm", "~> 2.1"
|
|
|
42da19c |
- s.add_dependency "winrm-fs", "~> 1.0"
|
|
|
42da19c |
- s.add_dependency "winrm-elevated", "~> 1.1"
|
|
|
b899893 |
+ # s.add_dependency "wdm", "~> 0.1.0"
|
|
|
42da19c |
+ # s.add_dependency "winrm", "~> 2.1"
|
|
|
42da19c |
+ # s.add_dependency "winrm-fs", "~> 1.0"
|
|
|
42da19c |
+ # s.add_dependency "winrm-elevated", "~> 1.1"
|
|
|
b899893 |
|
|
|
e37ffb0 |
# NOTE: The ruby_dep gem is an implicit dependency from the listen gem. Later versions
|
|
|
e37ffb0 |
# of the ruby_dep gem impose an aggressive constraint on the required ruby version (>= 2.2.5).
|
|
|
e37ffb0 |
# Explicit constraint is defined to provide required dependency to listen without imposing
|
|
|
e37ffb0 |
# tighter restrictions on valid ruby versions
|
|
|
e37ffb0 |
- s.add_dependency "ruby_dep", "<= 1.3.1"
|
|
|
e37ffb0 |
+ #
|
|
|
e37ffb0 |
+ # Do not impose any Ruby version restrictions on Fedora.
|
|
|
e37ffb0 |
+ # s.add_dependency "ruby_dep", "<= 1.3.1"
|
|
|
e37ffb0 |
|
|
|
854f8b4 |
# Constraint rake to properly handle deprecated method usage
|
|
|
854f8b4 |
# from within rspec
|
|
|
6788415 |
--
|
|
|
42da19c |
2.7.5
|
|
|
6788415 |
|