omit bundler deps

can't find place where it's required

diff --git a/chef.spec b/chef.spec
index 1846eb899959fe345325192c73ddd274a043d229..401388d149d216ad454b6bfcad4dc086db15bbed 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:       12.10.24
-Release:       0.6
+Release:       0.7
 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 271403fe4e4899aa468ce1f85a2bd428d8e66720..b8f118d89528c236c28dfaaef76b2a041b072cc1 100644 (file)
--- a/gemdeps.patch
+++ b/gemdeps.patch
@@ -1,6 +1,6 @@
---- chef-12.10.24/chef.gemspec 2016-06-02 19:54:04.001988520 +0300
-+++ chef-12.10.24/chef.gemspec 2016-06-02 22:12:49.407279113 +0300
-@@ -31,16 +31,6 @@
+--- chef-12.10.24/chef.gemspec 2016-06-02 22:12:49.407279113 +0300
++++ chef-12.10.24/chef.gemspec 2016-06-02 22:28:11.841446131 +0300
+@@ -31,25 +31,11 @@
    s.add_dependency "erubis", "~> 2.7"
    s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
  
@@ -17,3 +17,12 @@
    s.add_dependency "syslog-logger", "~> 1.6"
    s.add_dependency "uuidtools", "~> 2.1.5"
  
+   s.add_dependency "proxifier", "~> 1.0"
+ 
+-  # v1.10 is needed as a runtime dep now for 'bundler/inline'
+-  # very deliberately avoiding putting a ceiling on this to avoid depsolver conflicts.
+-  s.add_dependency "bundler", ">= 1.10"
+-
+   s.bindir       = "bin"
+   s.executables  = %w{ chef-client chef-solo knife chef-shell chef-apply }
+