[packages/chef] chef/version_string uses Gem class, but doesn't load it

glen glen at pld-linux.org
Thu Nov 1 14:42:33 CET 2018


commit 8540e2f5faabee44d15db465d8cfa5e1dc31a1be
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Thu Nov 1 15:41:49 2018 +0200

    chef/version_string uses Gem class, but doesn't load it

 chef.spec      |  4 +++-
 rubygems.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/chef.spec b/chef.spec
index e54a2ae..f94f61b 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:	1
+Release:	2
 License:	Apache v2.0
 Group:		Networking/Admin
 Source0:	https://github.com/chef/chef/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -23,6 +23,7 @@ Patch3:		https://github.com/glensc/chef/compare/pld-knife-boostrap.patch
 # Patch3-md5:	8ff0fdfde6dc90018698775bf8f13062
 Patch4:		optional-plist.patch
 Patch5:		gemdeps.patch
+Patch6:		rubygems.patch
 URL:		https://www.chef.io/
 BuildRequires:	rpm-rubyprov
 BuildRequires:	rpmbuild(macros) >= 1.673
@@ -101,6 +102,7 @@ subcommand is documented in its own manual page.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
 
diff --git a/rubygems.patch b/rubygems.patch
new file mode 100644
index 0000000..90d6eda
--- /dev/null
+++ b/rubygems.patch
@@ -0,0 +1,11 @@
+--- chef-14.1.36/lib/chef/version_string.rb~	2018-06-04 22:47:04.000000000 +0300
++++ chef-14.1.36/lib/chef/version_string.rb	2018-11-01 15:41:08.594148157 +0200
+@@ -13,6 +13,8 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
++require "rubygems"
++
+ class Chef
+   # String-like object for version strings.
+   #
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chef.git/commitdiff/8540e2f5faabee44d15db465d8cfa5e1dc31a1be



More information about the pld-cvs-commit mailing list