From 9d210e47372b9fb6b9a7b4b5b19f401aa1236df5 Mon Sep 17 00:00:00 2001
From: Miguel Perez <miguel250@gmail.com>
Date: Sat, 23 Mar 2013 23:51:49 -0400
Subject: [PATCH] Update build-essential cookbook

---
 build-essential/CHANGELOG.md          |  4 ++++
 build-essential/Gemfile               |  2 +-
 build-essential/README.md             |  2 ++
 build-essential/attributes/default.rb |  2 +-
 build-essential/metadata.rb           |  5 +++--
 build-essential/recipes/default.rb    | 14 +++++++-------
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/build-essential/CHANGELOG.md b/build-essential/CHANGELOG.md
index ae57b5a..4149dec 100755
--- a/build-essential/CHANGELOG.md
+++ b/build-essential/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.3.4:
+
+* [COOK-2272] - Complete `platform_family` conversion in build-essential
+
 ## v1.3.2:
 
 * [COOK-2069] - build-essential will install osx-gcc-installer when
diff --git a/build-essential/Gemfile b/build-essential/Gemfile
index f0f457b..46e0766 100755
--- a/build-essential/Gemfile
+++ b/build-essential/Gemfile
@@ -1,3 +1,3 @@
 source :rubygems
 
-gem 'test-kitchen'
+gem 'test-kitchen', '< 1.0'
diff --git a/build-essential/README.md b/build-essential/README.md
index 606e02e..b3b8fb0 100755
--- a/build-essential/README.md
+++ b/build-essential/README.md
@@ -8,6 +8,8 @@ with native extensions.
 Requirements
 ============
 
+Chef version 0.10.10+ and Ohai 0.6.12+ are required.
+
 ## Platform
 
 Supported platforms by platform family:
diff --git a/build-essential/attributes/default.rb b/build-essential/attributes/default.rb
index f32186b..f45750f 100755
--- a/build-essential/attributes/default.rb
+++ b/build-essential/attributes/default.rb
@@ -19,7 +19,7 @@
 
 default['build_essential']['compiletime'] = false
 
-case node['platform']
+case node['platform_family']
 when "mac_os_x"
   case
   when Chef::VersionConstraint.new("~> 10.7.0").include?(node['platform_version']),
diff --git a/build-essential/metadata.rb b/build-essential/metadata.rb
index a99dd16..70b6add 100755
--- a/build-essential/metadata.rb
+++ b/build-essential/metadata.rb
@@ -3,12 +3,13 @@
 maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
 description       "Installs C compiler / build tools"
-version           "1.3.2"
+version           "1.3.4"
 recipe            "build-essential", "Installs packages required for compiling C software from source."
 
-%w{ fedora redhat centos ubuntu debian amazon suse scientific smartos}.each do |os|
+%w{ fedora redhat centos ubuntu debian amazon suse scientific oracle smartos}.each do |os|
   supports os
 end
 
 supports "mac_os_x", ">= 10.6.0"
+supports "mac_os_x_server", ">= 10.6.0"
 suggests "pkgin"
diff --git a/build-essential/recipes/default.rb b/build-essential/recipes/default.rb
index bf70e9b..4eff373 100755
--- a/build-essential/recipes/default.rb
+++ b/build-essential/recipes/default.rb
@@ -21,8 +21,8 @@
 
 compiletime = node['build_essential']['compiletime']
 
-case node['platform']
-when "centos", "redhat", "suse", "fedora", "scientific", "amazon", "ubuntu","debian"
+case node['platform_family']
+when "rhel", "suse", "fedora", "debian"
 
   # on apt-based platforms when first provisioning we need to force
   # apt-get update at compiletime if we are going to try to install at compiletime
@@ -64,12 +64,12 @@
 when "smartos"
     include_recipe 'pkgin'
     %w{gcc47 gcc47-runtime scmgit-base gmake pkg-config binutils}.each do |package|
-			pkgin_package package do 
-      	action :install 
-    	end
-		end
+      pkgin_package package do
+        action :install
+      end
+    end
 
-when "darwin"
+when "mac_os_x"
   result = Chef::ShellOut.new("pkgutil --pkgs").run_command
   osx_gcc_installer_installed = result.stdout.split("\n").include?("com.apple.pkg.gcc4.2Leo")
   developer_tools_cli_installed = result.stdout.split("\n").include?("com.apple.pkg.DeveloperToolsCLI")