From 858288a982c1946771702b6e7c5cd97fc818393e Mon Sep 17 00:00:00 2001
From: John Keiser <john@johnkeiser.com>
Date: Fri, 11 Mar 2016 07:38:23 -0800
Subject: [PATCH] Bring in libgecode-dep-selector changes

---
 omnibus/.gitignore                | 5 +++--
 omnibus/.kitchen.yml              | 9 ++++++---
 omnibus/Gemfile                   | 8 ++++----
 omnibus/config/projects/chefdk.rb | 1 +
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/omnibus/.gitignore b/omnibus/.gitignore
index 6417a1683..309104b17 100644
--- a/omnibus/.gitignore
+++ b/omnibus/.gitignore
@@ -1,8 +1,9 @@
+Berksfile.lock
+bin/
 .bundle
 vendor/bundle
-pkg/*
+pkg/
 .kitchen.local.yml
-bin/*
 files/chef-server-cookbooks/cache/
 files/msi/ChefClient-Config.wxi
 cookbooks
diff --git a/omnibus/.kitchen.yml b/omnibus/.kitchen.yml
index 26de236b9..465c5f1d3 100644
--- a/omnibus/.kitchen.yml
+++ b/omnibus/.kitchen.yml
@@ -52,13 +52,13 @@ platforms:
     run_list: apt::default
   # The following (private) boxes are shared via Atlas and are only
   # available to users working for Chef. Sorry, it's about software licensing.
-  # 
-  # Chef-internal users, you will need to:  
+  #
+  # Chef-internal users, you will need to:
   # 1.  Create an Atlas account:  https://atlas.hashicorp.com/
   # 2.  Ping the Release Services room with your Atlas account name
   #     to be added to the relevant team in Atlas,
   # 3.  Do `vagrant login` with your Atlas creds so that you can download
-  #     the private boxes.   
+  #     the private boxes.
   #
   # The Mac OS X boxes are VMware only also. You can enable VMware Fusion
   # as the default provider by copying `.kitchen.local.yml.vmware.example`
@@ -82,6 +82,9 @@ platforms:
   - name: windows-2008r2-standard
     driver:
       box: chef/windows-server-2008r2-standard # private
+  - name: windows-2012r2-standard
+    driver:
+      box: chef/windows-server-2012r2-standard # private
 
 attribute_defaults: &attribute_defaults
   build_user:          vagrant
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 51b9af4e9..edf90ae52 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -13,10 +13,10 @@ gem 'pedump', git: 'https://github.com/ksubrama/pedump.git', branch: 'patch-1'
 # by running `bundle install --without development` to speed up build times.
 group :development do
   # Use Berkshelf for resolving cookbook dependencies
-  gem 'berkshelf', '~> 3.0'
+  gem 'berkshelf'
 
   # Use Test Kitchen with Vagrant for converging the build environment
-  gem 'test-kitchen',    '~> 1.6'
-  gem 'kitchen-vagrant', '~> 0.19.0'
-  gem 'winrm-fs', '~> 0.3'
+  gem 'test-kitchen'
+  gem 'kitchen-vagrant'
+  gem 'winrm-fs'
 end
diff --git a/omnibus/config/projects/chefdk.rb b/omnibus/config/projects/chefdk.rb
index 40f14ceb2..84fb4d101 100644
--- a/omnibus/config/projects/chefdk.rb
+++ b/omnibus/config/projects/chefdk.rb
@@ -44,6 +44,7 @@
 override :'kitchen-inspec', version: "v0.12.3"
 
 override :berkshelf,        version: "v4.3.0"
+override :'dep-selector-libgecode', version: "1.2.0"
 
 override :'test-kitchen',   version: "v1.6.0"