relax net-ssh dep to allow v5

diff --git a/chef.spec b/chef.spec
index e4c1540908e47f20e4ab9339ce304513e2a7229f..46c0b8008af58663339a80bbdc2dcc81bff91b48 100644 (file)
--- a/chef.spec
+++ b/chef.spec
@@ -8,7 +8,7 @@
 Summary:       A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure
 Name:          chef
 Version:       14.1.36
-Release:       0.1
+Release:       0.2
 License:       Apache v2.0
 Group:         Networking/Admin
 Source0:       https://github.com/chef/chef/archive/v%{version}/%{name}-%{version}.tar.gz

diff --git a/gemdeps.patch b/gemdeps.patch
index f61a5a7ef68bcaf8a8dd4008928288e3e38a2816..2c9fa94622b299194c7fcd17cf748fe0d1c4fb96 100644 (file)
--- a/gemdeps.patch
+++ b/gemdeps.patch
@@ -1,5 +1,14 @@
---- chef-14.1.21/chef.gemspec~ 2018-05-21 19:22:54.000000000 +0300
-+++ chef-14.1.21/chef.gemspec  2018-07-16 14:45:25.219811439 +0300
+--- chef-14.1.21/chef.gemspec  2018-07-16 14:45:25.219811439 +0300
++++ chef-14.1.36/chef.gemspec  2018-07-16 16:31:33.837545915 +0300
+@@ -26,7 +26,7 @@
+ 
+   s.add_dependency "ffi", "~> 1.9", ">= 1.9.25"
+   s.add_dependency "ffi-yajl", "~> 2.2"
+-  s.add_dependency "net-ssh", "~> 4.2"
++  s.add_dependency "net-ssh", ">= 4.2"
+   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
+   s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2"
+   s.add_dependency "highline", "~> 1.6", ">= 1.6.9"
 @@ -34,28 +34,15 @@
    s.add_dependency "erubis", "~> 2.7"
    s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"