[vagrant] Not the json upstream PR.

[Vít Ondruch]

commit 532180f3b6ca4ad4fa97ad16831835ffbf59c435
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Mon Nov 3 12:59:17 2014 +0100

    Not the json upstream PR.

 vagrant-1.6.5-fix-dependencies.patch |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/vagrant-1.6.5-fix-dependencies.patch b/vagrant-1.6.5-fix-dependencies.patch
index f872078..069dde3 100644
--- a/vagrant-1.6.5-fix-dependencies.patch
+++ b/vagrant-1.6.5-fix-dependencies.patch
@@ -43,10 +43,10 @@ index 8756fc3..7fb2be8 100644
  
          return [options, subprocess_options]
 diff --git a/vagrant.gemspec b/vagrant.gemspec
-index c4131b2..4fd9d68 100644
+index c4131b2..9736a72 100644
 --- a/vagrant.gemspec
 +++ b/vagrant.gemspec
-@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
+@@ -15,27 +15,29 @@ Gem::Specification.new do |s|
    s.required_rubygems_version = ">= 1.3.6"
    s.rubyforge_project         = "vagrant"
  
@@ -56,7 +56,9 @@ index c4131b2..4fd9d68 100644
    s.add_dependency "childprocess", "~> 0.5.0"
    s.add_dependency "erubis", "~> 2.7.0"
    s.add_dependency "i18n", "~> 0.6.0"
-@@ -23,19 +24,19 @@ Gem::Specification.new do |s|
++  # https://github.com/mitchellh/vagrant/pull/4770
++  s.add_dependency "json"
+   s.add_dependency "listen", "~> 2.7.1"
    s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"
    s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
    s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0"
@@ -69,7 +71,6 @@ index c4131b2..4fd9d68 100644
 +  #s.add_dependency "wdm", "~> 0.1.0"
 +  #s.add_dependency "winrm", "~> 1.1.3"
 +  s.add_dependency "nokogiri"
-+  s.add_dependency "json"
 +  s.add_dependency "rb-inotify"
  
 -  # We lock this down to avoid compilation issues.