- relax net-ssh dependency (5.0.0 has just a bunch of new features)

- rel 2

diff --git a/net-ssh.patch b/net-ssh.patch
new file mode 100644 (file)
index 0000000..7f588f5
--- /dev/null
+++ b/net-ssh.patch
@@ -0,0 +1,11 @@
+--- vagrant-2.1.2/vagrant.gemspec~     2018-07-15 10:36:09.000000000 +0200
++++ vagrant-2.1.2/vagrant.gemspec      2018-07-15 10:41:18.155322829 +0200
+@@ -22,7 +22,7 @@
+   s.add_dependency "listen", "~> 2.7.11"
+   s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
+   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
+-  s.add_dependency "net-ssh", "~> 4.2.0"
++  s.add_dependency "net-ssh", ">= 4.2.0"
+   s.add_dependency "net-sftp", "~> 2.1"
+   s.add_dependency "net-scp", "~> 1.2.0"
+   s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"

diff --git a/vagrant.spec b/vagrant.spec
index 91d3c0f1b159b5c1277a88d099a88c06758b0119..4e6a160f8fdcacb06262adef064c95c48a8c6f49 100644 (file)
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -3,7 +3,7 @@
 Summary:       Provisioning and deployment of virtual instances
 Name:          vagrant
 Version:       2.1.2
 Summary:       Provisioning and deployment of virtual instances
 Name:          vagrant
 Version:       2.1.2

-Release:       1
+Release:       2

 License:       MIT
 Group:         Applications/Emulators
 Source0:       https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz
 License:       MIT
 Group:         Applications/Emulators
 Source0:       https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz


@@ -17,6 +17,7 @@ Patch5:               no-gems.patch
 Patch7:                insert-key.patch
 Patch8:                listen.patch
 Patch9:                pld-chef-installed.patch
 Patch7:                insert-key.patch
 Patch8:                listen.patch
 Patch9:                pld-chef-installed.patch

+Patch10:       net-ssh.patch

 URL:           http://www.vagrantup.com/
 BuildRequires: bash
 BuildRequires: rpm-rubyprov
 URL:           http://www.vagrantup.com/
 BuildRequires: bash
 BuildRequires: rpm-rubyprov


@@ -114,6 +115,7 @@ Ruby documentation for %{gem_name}
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1

+%patch10 -p1

 
 VERSION=$(cat version.txt)
 sed -i -e "s/__VERSION__/$VERSION/" lib/vagrant/version.rb
 
 VERSION=$(cat version.txt)
 sed -i -e "s/__VERSION__/$VERSION/" lib/vagrant/version.rb