up to 1.7.0

diff --git a/no-gems.patch b/no-gems.patch
index df7bfd72ef1af734d8f5627e8a128e27afc40067..cdaa3dbe425ae8d844e94585b72c4c3bad1580e1 100644 (file)
--- a/no-gems.patch
+++ b/no-gems.patch
@@ -1,12 +1,13 @@
---- vagrant-1.6.3/vagrant.gemspec~     2014-05-29 20:36:24.000000000 +0300
-+++ vagrant-1.6.3/vagrant.gemspec      2014-07-27 12:56:26.913246802 +0300
-@@ -23,9 +23,6 @@
-   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
+--- vagrant-1.7.0/vagrant.gemspec~     2014-12-10 06:38:17.000000000 +0200
++++ vagrant-1.7.0/vagrant.gemspec      2014-12-14 13:20:27.428207093 +0200
+@@ -25,10 +25,7 @@
    s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0"
+   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.7"
 -  s.add_dependency "wdm", "~> 0.1.0"
 -  s.add_dependency "winrm", "~> 1.1.3"
  
-   s.add_development_dependency "rake"
-   s.add_development_dependency "contest", ">= 0.1.2"
+   # We lock this down to avoid compilation issues.
+   s.add_dependency "nokogiri", "= 1.6.3.1"

diff --git a/vagrant.spec b/vagrant.spec
index f369023dc8d122e1d17578631e6e48cdf4517dee..58639fed00cfd23e787f690c32c23a965f90cd52 100644 (file)
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -2,13 +2,13 @@
 # - release notes: https://github.com/mitchellh/vagrant/blob/master/CHANGELOG.md
 Summary:       Provisioning and deployment of virtual instances
 Name:          vagrant
-Version:       1.6.3
+Version:       1.7.0
 # NOTE: test that it actually works before doing rel "1"
 Release:       0.1
 License:       MIT
 Group:         Applications/Emulators
 Source0:       https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 55a91a9d9cba7b8b9d126c75b114e510
+# Source0-md5: b47dcf57149736578116b7d0de25282f
 Source100:     runtime-broken
 Patch0:                source_root.patch
 Patch1:                rubygems.patch