[packages/chef/chef-12] fix optional plist
glen
glen at pld-linux.org
Thu Jun 2 21:43:22 CEST 2016
commit 41f404110ddf4864cc087c5231efaf7e8502e4cb
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jun 2 22:43:01 2016 +0300
fix optional plist
chef.spec | 2 +-
optional-plist.patch | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/chef.spec b/chef.spec
index 401388d..7ed2efc 100644
--- 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.7
+Release: 0.8
License: Apache v2.0
Group: Networking/Admin
Source0: https://github.com/chef/chef/archive/v%{version}/%{name}-%{version}.tar.gz
diff --git a/optional-plist.patch b/optional-plist.patch
index f52de0f..38c8071 100644
--- a/optional-plist.patch
+++ b/optional-plist.patch
@@ -32,3 +32,21 @@
user_plist_file = "#{USER_PLIST_DIRECTORY}/#{new_resource.username}.plist"
Plist::Emit.save_plist(user_info, user_plist_file)
run_plutil("convert binary1 #{user_plist_file}")
+--- ./lib/chef/provider/launchd.rb~ 2016-04-27 20:57:14.000000000 +0300
++++ ./lib/chef/provider/launchd.rb 2016-06-02 22:33:01.049679641 +0300
+@@ -21,7 +21,6 @@
+ require "chef/resource/file"
+ require "chef/resource/cookbook_file"
+ require "chef/resource/macosx_service"
+-require "plist"
+ require "forwardable"
+
+ class Chef
+@@ -150,6 +149,7 @@
+ end
+
+ def content
++ require "plist"
+ plist_hash = new_resource.hash || gen_hash
+ Plist::Emit.dump(plist_hash) unless plist_hash.nil?
+ end
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chef.git/commitdiff/41f404110ddf4864cc087c5231efaf7e8502e4cb
More information about the pld-cvs-commit
mailing list