vagrant/0006-Relax-dependency-resolution.patch

80 lines
3.0 KiB
Diff
Raw Normal View History

From: Antonio Terceiro <terceiro@debian.org>
Date: Sun, 16 Aug 2015 10:45:47 +0200
Subject: Relax dependency resolution
---
Gemfile | 6 ------
vagrant.gemspec | 45 +++++++++++++++------------------------------
2 files changed, 15 insertions(+), 36 deletions(-)
diff --git a/Gemfile b/Gemfile
index 15f2458..b4e2a20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,3 @@
source "https://rubygems.org"
gemspec
-
-if File.exist?(File.expand_path("../../vagrant-spec", __FILE__))
- gem 'vagrant-spec', path: "../vagrant-spec"
-else
- gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git"
-end
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 3c74eb1..f7da9f6 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -16,36 +16,21 @@ Gem::Specification.new do |s|
s.required_rubygems_version = ">= 1.3.6"
s.rubyforge_project = "vagrant"
- s.add_dependency "childprocess", "~> 0.5.0"
- s.add_dependency "erubis", "~> 2.7.0"
- s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
- s.add_dependency "listen", "~> 3.1.5"
- s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"
- s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
- s.add_dependency "net-ssh", "~> 3.0.1"
- s.add_dependency "net-sftp", "~> 2.1"
- s.add_dependency "net-scp", "~> 1.1.0"
- s.add_dependency "rb-kqueue", "~> 0.2.0"
- s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
- s.add_dependency "wdm", "~> 0.1.0"
- s.add_dependency "winrm", "~> 1.6"
- s.add_dependency "winrm-fs", "~> 0.3.0"
-
- # We lock this down to avoid compilation issues.
- s.add_dependency "nokogiri", "= 1.6.7.1"
-
- # NOTE: The ruby_dep gem is an implicit dependency from the listen gem. Later versions
- # of the ruby_dep gem impose an aggressive constraint on the required ruby version (>= 2.2.5).
- # Explicit constraint is defined to provide required dependency to listen without imposing
- # tighter restrictions on valid ruby versions
- s.add_dependency "ruby_dep", "<= 1.3.1"
-
- # Constraint rake to properly handle deprecated method usage
- # from within rspec
- s.add_development_dependency "rake", "~> 11.3.0"
- s.add_development_dependency "rspec", "~> 2.14.0"
- s.add_development_dependency "webmock", "~> 1.20"
- s.add_development_dependency "fake_ftp", "~> 0.1"
+ ########################################################################
+ # On Debian, it not viable to lock down much of the dependencies because they
+ # are shared across applications in the entire archive. So here we are being
+ # optimistic and replacing `=` with `~>`.
+ ########################################################################
+ s.add_dependency "childprocess"
+ s.add_dependency "erubis"
+ s.add_dependency "i18n"
+ s.add_dependency "listen"
+ s.add_dependency "log4r"
+ s.add_dependency "net-ssh"
+ s.add_dependency "net-sftp"
+ s.add_dependency "net-scp"
+ s.add_dependency "rest-client"
+ s.add_dependency "nokogiri"
# The following block of code determines the files that should be included
# in the gem. It does this by reading all the files in the directory where