From 6cfca9920db64e148bc0378120aaa12c4dc8a582 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Tue, 8 Apr 2014 17:06:08 -0700 Subject: pin sdoc to make solaris builds happy rdoc/sdoc now has files with spaces in them that solaris can't package. --- chef/chef.gemspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chef/chef.gemspec b/chef/chef.gemspec index 0e541dabc3..a1c5c017a4 100644 --- a/chef/chef.gemspec +++ b/chef/chef.gemspec @@ -39,7 +39,8 @@ Gem::Specification.new do |s| %w{erubis uuidtools}.each { |gem| s.add_dependency gem } # development_dependency thin: eventmachine 0.12.10 doesn't support Ruby 1.9 on Windows - %w(rdoc sdoc rake rack rspec_junit_formatter).each { |gem| s.add_development_dependency gem } + s.add_development_dependency "sdoc", "~> 0.3.0" + %w(rdoc rake rack rspec_junit_formatter).each { |gem| s.add_development_dependency gem } %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 2.12.0" } s.bindir = "bin" -- cgit v1.2.1 From 7262b4441cfb95cf9a5aa28b12c182c8466f0b52 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Tue, 8 Apr 2014 17:12:21 -0700 Subject: add a changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea0f78ae66..f0ef9536b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Chef now gracefully handles corrupted cache files. * SIGTERM will once-more kill a non-daemonized chef-client (CHEF-5172) * bump up upper limit on json gem to 1.8.1 (CHEF-4632) +* pin sdoc to 0.3.0 due to solaris packaging issues. ## Last Release: 10.30.4 (02/18/2014) -- cgit v1.2.1