commit 123d7498d63a615469b5d4309315aa06be99d57f
Author: Elan Ruusamäe <g...@pld-linux.org>
Date: Sat Jul 21 18:25:18 2018 +0300
up to 14.3.37 (current stable)
FHS.patch | 17 ++++++++++++++---
chef.spec | 8 ++++----
2 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/chef.spec b/chef.spec
index d05ebad..fbaa23a 100644
--- a/chef.spec
+++ b/chef.spec
@@ -1,5 +1,5 @@
# NOTE:
-# - check releases here: https://downloads.chef.io/chef-client/debian/
+# - check releases here: https://downloads.chef.io/chef
# the versions tagged in github are somewhat newer, perhaps dev-releases
# Conditional build:
@@ -7,12 +7,12 @@
Summary: A systems integration framework, built to bring the benefits of
configuration management to your entire infrastructure
Name: chef
-Version: 14.1.36
-Release: 0.7
+Version: 14.3.37
+Release: 0.1
License: Apache v2.0
Group: Networking/Admin
Source0:
https://github.com/chef/chef/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 442169a1a824b3335376a88723e133a0
+# Source0-md5: 359e65ddde289f6bfb33a95fabb81d0c
Source2: %{name}.tmpfiles
Source3:
https://raw.github.com/stevendanna/knife-hacks/master/shell/knife_completion.sh
# Source3-md5: a4c1e41370be8088a59ddb3b2e7ea397
diff --git a/FHS.patch b/FHS.patch
index 97e0690..3ea1b04 100644
--- a/FHS.patch
+++ b/FHS.patch
@@ -35,6 +35,17 @@
# The chef-client (or solo) lockfile.
#
+--- chef-14.3.37/lib/chef/resource/launchd.rb~ 2018-07-10 23:49:12.000000000
+0300
++++ chef-14.3.37/lib/chef/resource/launchd.rb 2018-07-21 18:36:11.686358648
+0300
+@@ -36,7 +36,7 @@
+
+ property :backup, [Integer, FalseClass],
+ desired_state: false,
+- description: "The number of backups to be kept in
/var/chef/backup. Set to false to prevent backups from being kept."
++ description: "The number of backups to be kept in
/var/lib/chef/backup. Set to false to prevent backups from being kept."
+
+ property :cookbook, String,
+ desired_state: false,
--- chef-14.1.21/chef-config/spec/unit/config_spec.rb.orig 2018-05-21
18:22:54.000000000 +0200
+++ chef-14.1.21/chef-config/spec/unit/config_spec.rb 2018-07-14
22:10:47.642865027 +0200
@@ -252,7 +252,7 @@
@@ -164,8 +175,8 @@
end
# Don't need to have an after block to reset the config...
---- chef-14.1.21/spec/unit/application/solo_spec.rb~ 2018-05-21
18:22:54.000000000 +0200
-+++ chef-14.1.21/spec/unit/application/solo_spec.rb 2018-07-14
22:13:57.265002987 +0200
+--- chef-14.3.37/spec/unit/application/solo_spec.rb~ 2018-07-10
23:49:12.000000000 +0300
++++ chef-14.3.37/spec/unit/application/solo_spec.rb 2018-07-21
18:35:10.469813803 +0300
@@ -206,10 +206,10 @@
end
@@ -173,7 +184,7 @@
- expect(Chef::Config).to
receive(:find_chef_repo_path).and_return("/var/chef")
+ expect(Chef::Config).to
receive(:find_chef_repo_path).and_return("/var/lib/chef")
app.reconfigure
- expect(Chef::Config.has_key?(:chef_repo_path)).to be_truthy
+ expect(Chef::Config.key?(:chef_repo_path)).to be_truthy
- expect(Chef::Config[:chef_repo_path]).to eq ("/var/chef")
+ expect(Chef::Config[:chef_repo_path]).to eq ("/var/lib/chef")
end
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chef.git/commitdiff/123d7498d63a615469b5d4309315aa06be99d57f
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
