From: Elan Ruusamäe Date: Tue, 17 Jul 2018 09:13:40 +0000 (+0300) Subject: updated platform-pld.patch from master X-Git-Tag: auto/th/chef-14.1.36-2~1^2~3 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fchef.git;a=commitdiff_plain;h=33e248704a439187956daf6a509dcba0034df9ee;ds=sidebyside updated platform-pld.patch from master refs: a8f01bdc --- diff --git a/chef.spec b/chef.spec index 7d1c012..10f034e 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: 14.1.36 -Release: 0.3 +Release: 0.5 License: Apache v2.0 Group: Networking/Admin Source0: https://github.com/chef/chef/archive/v%{version}/%{name}-%{version}.tar.gz @@ -95,7 +95,7 @@ subcommand is documented in its own manual page. %prep %setup -q -#%patch0 -p1 # UPDATE +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 diff --git a/platform-pld.patch b/platform-pld.patch index 932acf8..281c13b 100644 --- a/platform-pld.patch +++ b/platform-pld.patch @@ -1,19 +1,19 @@ ---- chef-11.14.2/lib/chef/platform/provider_mapping.rb~ 2014-12-04 18:02:46.000000000 +0200 -+++ chef-11.14.2/lib/chef/platform/provider_mapping.rb 2014-12-04 18:07:26.765336890 +0200 -@@ -194,6 +194,16 @@ - :group => Chef::Provider::Group::Suse - } +--- chef-14.1.21/spec/unit/provider_resolver_spec.rb.orig 2018-05-21 18:22:54.000000000 +0200 ++++ chef-14.1.21/spec/unit/provider_resolver_spec.rb 2018-07-14 21:52:07.158840235 +0200 +@@ -722,6 +722,16 @@ }, -+ :pld => { -+ :default => { -+ :service => Chef::Provider::Service::Redhat, -+ :cron => Chef::Provider::Cron, -+ :package => Chef::Provider::Package::Poldek, -+ :mdadm => Chef::Provider::Mdadm, -+ :ifconfig => Chef::Provider::Ifconfig::Redhat, # TODO: PLD config path needed -+ :group => Chef::Provider::Group::Usermod, -+ } + }, + ++ "pld" => { ++ # service: [ Chef::Resource::SystemdService, Chef::Provider::Service::Systemd ], ++ package: [ Chef::Resource::PoldekPackage, Chef::Provider::Package::Poldek ], ++ ifconfig: [ Chef::Resource::Ifconfig, Chef::Provider::Ifconfig::Redhat ], ++ group: [ Chef::Resource::Group, Chef::Provider::Group::Usermod ], ++ ++ "pld" => { ++ "3.0" => { ++ }, + }, - :oracle => { - :default => { - :service => Chef::Provider::Service::Redhat, + }, + + "freebsd" => {