updated poldek patch for chef-12

diff --git a/chef.spec b/chef.spec
index 10f034e770399e186e9f9c6ce55c233e44e6e328..603698083c9bcd589b0f1712c07d01eb762f5cfe 100644 (file)
--- 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.5
+Release:       0.6
 License:       Apache v2.0
 Group:         Networking/Admin
 Source0:       https://github.com/chef/chef/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -23,7 +23,7 @@ Patch3:               https://github.com/glensc/chef/compare/pld-knife-boostrap.patch
 # Patch3-md5:  8ff0fdfde6dc90018698775bf8f13062
 Patch4:                optional-plist.patch
 Patch5:                gemdeps.patch
-URL:           https://wiki.opscode.com/display/chef/
+URL:           https://www.chef.io/
 BuildRequires: rpm-rubyprov
 BuildRequires: rpmbuild(macros) >= 1.673
 BuildRequires: sed >= 4.0

diff --git a/poldek.patch b/poldek.patch
index dfe39f74bb2c0fdaf4958fef3dc56660e61e2ae8..61c1c95cbea5841dddad7c992975532bf866a38b 100644 (file)
--- a/poldek.patch
+++ b/poldek.patch
@@ -1,14 +1,16 @@
 poldek package manager support
 
-https://tickets.opscode.com/browse/CHEF-4476
-https://github.com/opscode/chef/pull/1225
+https://github.com/chef/chef/pull/7482
 
---- chef-11.12.8/lib/chef/provider/package/poldek.rb   1970-01-01 02:00:00.000000000 +0200
-+++ chef-11.12.8.poldek/lib/chef/provider/package/poldek.rb    2014-12-04 18:27:24.468416380 +0200
-@@ -0,0 +1,123 @@
+diff --git a/lib/chef/provider/package/poldek.rb b/lib/chef/provider/package/poldek.rb
+new file mode 100644
+index 000000000..63e3961a0
+--- /dev/null
++++ b/lib/chef/provider/package/poldek.rb
+@@ -0,0 +1,125 @@
 +#
 +# Author:: Elan Ruusamäe (glen@pld-linux.org)
-+# Copyright:: Copyright (c) 2013 Elan Ruusamäe
++# Copyright:: Copyright (c) 2013,2018 Elan Ruusamäe
 +# License:: Apache License, Version 2.0
 +#
 +# Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,6 +39,8 @@ https://github.com/opscode/chef/pull/1225
 +        include Chef::Mixin::ShellOut
 +        attr_accessor :is_virtual_package
 +
++        provides :package, platform_family: "pld"
++
 +        def load_current_resource
 +            Chef::Log.debug("#{@new_resource} loading current resource")
 +            @current_resource = Chef::Resource::Package.new(@new_resource.name)
@@ -129,18 +133,23 @@ https://github.com/opscode/chef/pull/1225
 +    end
 +  end
 +end
---- chef-12.10.24/lib/chef/providers.rb~       2016-06-01 23:57:35.000000000 +0300
-+++ chef-12.10.24/lib/chef/providers.rb        2016-06-01 23:58:15.093249546 +0300
-@@ -72,6 +72,7 @@
- require "chef/provider/package/macports"
+diff --git a/lib/chef/providers.rb b/lib/chef/providers.rb
+index cd265b061..075ffd7e8 100644
+--- a/lib/chef/providers.rb
++++ b/lib/chef/providers.rb
+@@ -74,6 +74,7 @@ require "chef/provider/package/macports"
  require "chef/provider/package/openbsd"
  require "chef/provider/package/pacman"
-+require "chef/provider/package/poldek"
  require "chef/provider/package/portage"
++require 'chef/provider/package/poldek'
  require "chef/provider/package/paludis"
  require "chef/provider/package/rpm"
---- chef-11.12.8/lib/chef/resource/poldek_package.rb   1970-01-01 02:00:00.000000000 +0200
-+++ chef-11.12.8.poldek/lib/chef/resource/poldek_package.rb    2014-12-04 18:27:24.438414927 +0200
+ require "chef/provider/package/rubygems"
+diff --git a/lib/chef/resource/poldek_package.rb b/lib/chef/resource/poldek_package.rb
+new file mode 100644
+index 000000000..cdc8f9209
+--- /dev/null
++++ b/lib/chef/resource/poldek_package.rb
 @@ -0,0 +1,34 @@
 +#
 +# Author:: Elan Ruusamäe (glen@pld-linux.org)