From 72537748519960ac7749bc39e1667bded36dfe3e Mon Sep 17 00:00:00 2001
From: Kartik Null Cating-Subramanian <ksubramanian@chef.io>
Date: Tue, 21 Apr 2015 12:43:49 -0400
Subject: Switch over Windows builds to universal builds.

Updated dependencies and refactored platform gemspecs.
---
 Rakefile                 |  2 +-
 chef-windows.gemspec     | 22 ++++++++++++++++++++++
 chef-x86-mingw32.gemspec | 23 -----------------------
 chef.gemspec             |  4 ++--
 4 files changed, 25 insertions(+), 26 deletions(-)
 create mode 100644 chef-windows.gemspec
 delete mode 100644 chef-x86-mingw32.gemspec

diff --git a/Rakefile b/Rakefile
index 70a45d94c0..e9e345dbf8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -40,7 +40,7 @@ task :uninstall do
 end
 
 desc "Build it, tag it and ship it"
-task :ship => :gem do
+task :ship => [:clobber_package, :gem] do
   sh("git tag #{Chef::VERSION}")
   sh("git push opscode --tags")
   Dir[File.expand_path("../pkg/*.gem", __FILE__)].reverse.each do |built_gem|
diff --git a/chef-windows.gemspec b/chef-windows.gemspec
new file mode 100644
index 0000000000..167358c7d7
--- /dev/null
+++ b/chef-windows.gemspec
@@ -0,0 +1,22 @@
+gemspec = eval(IO.read(File.expand_path("../chef.gemspec", __FILE__)))
+
+gemspec.platform = Gem::Platform.new(["universal", "mingw32"])
+
+gemspec.add_dependency "ffi", "~> 1.9"
+gemspec.add_dependency "win32-api", "~> 1.5.3"
+gemspec.add_dependency "win32-dir", "~> 0.5.0"
+gemspec.add_dependency "win32-event", "~> 0.6.1"
+gemspec.add_dependency "win32-eventlog", "~> 0.6.2"
+gemspec.add_dependency "win32-mmap", "~> 0.4.1"
+gemspec.add_dependency "win32-mutex", "~> 0.4.2"
+gemspec.add_dependency "win32-process", "~> 0.7.5"
+gemspec.add_dependency "win32-service", "0.8.6"
+gemspec.add_dependency "windows-api", "~> 0.4.4"
+gemspec.add_dependency "windows-pr", "~> 1.2.4"
+gemspec.add_dependency "wmi-lite", "~> 1.0"
+gemspec.extensions << "ext/win32-eventlog/Rakefile"
+gemspec.files += %w(ext/win32-eventlog/Rakefile ext/win32-eventlog/chef-log.man)
+
+gemspec.executables += %w( chef-service-manager chef-windows-service )
+
+gemspec
diff --git a/chef-x86-mingw32.gemspec b/chef-x86-mingw32.gemspec
deleted file mode 100644
index 18c31d8354..0000000000
--- a/chef-x86-mingw32.gemspec
+++ /dev/null
@@ -1,23 +0,0 @@
-# x86-mingw32 Gemspec #
-gemspec = eval(IO.read(File.expand_path("../chef.gemspec", __FILE__)))
-
-gemspec.platform = "x86-mingw32"
-
-gemspec.add_dependency "ffi", "~> 1.9"
-gemspec.add_dependency "windows-api", "~> 0.4.2"
-gemspec.add_dependency "windows-pr", "~> 1.2.2"
-gemspec.add_dependency "win32-api", "~> 1.5.1"
-gemspec.add_dependency "win32-dir", "0.4.5"
-gemspec.add_dependency "win32-event", "0.6.1"
-gemspec.add_dependency "win32-mutex", "0.4.1"
-gemspec.add_dependency "win32-process", "~> 0.7.3"
-gemspec.add_dependency "win32-service", "0.8.2"
-gemspec.add_dependency "win32-mmap", "0.4.0"
-gemspec.add_dependency "wmi-lite", "~> 1.0"
-gemspec.add_dependency "win32-eventlog", "0.6.1"
-gemspec.extensions << "ext/win32-eventlog/Rakefile"
-gemspec.files += %w(ext/win32-eventlog/Rakefile ext/win32-eventlog/chef-log.man)
-
-gemspec.executables += %w( chef-service-manager chef-windows-service )
-
-gemspec
diff --git a/chef.gemspec b/chef.gemspec
index dc0e59ad3e..8bec26ea7c 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.description = s.summary
   s.license = "Apache-2.0"
   s.author = "Adam Jacob"
-  s.email = "adam@getchef.com"
-  s.homepage = "http://www.getchef.com"
+  s.email = "adam@chef.io"
+  s.homepage = "http://www.chef.io"
 
   s.required_ruby_version = ">= 2.0.0"
 
-- 
cgit v1.2.1