[packages/chef] Fix --no-ri patch

glen glen at pld-linux.org
Thu May 14 10:24:27 CEST 2020


commit 1b5b56da1bccaf5103bcef94e1235fa12c18dc84
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Thu May 14 11:17:56 2020 +0300

    Fix --no-ri patch

 7994.patch | 4 ++--
 chef.spec  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/chef.spec b/chef.spec
index c727fc8..9f09a8c 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:	4
+Release:	5
 License:	Apache v2.0
 Group:		Networking/Admin
 Source0:	https://github.com/chef/chef/archive/v%{version}/%{name}-%{version}.tar.gz
diff --git a/7994.patch b/7994.patch
index 484ccf2..18a6a95 100644
--- a/7994.patch
+++ b/7994.patch
@@ -112,10 +112,10 @@ index d99dce89720..cd595e64f4f 100644
            src_str = src.empty? ? "" : " #{src.join(" ")}"
            if !version.nil? && !version.empty?
 -            shell_out_with_timeout!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src_str}#{opts}", env: nil)
-+            shell_out_with_timeout!("#{gem_binary_path} install #{name} -q #{rdoc_string} --no-ri -v \"#{version}\"#{src_str}#{opts}", env: nil)
++            shell_out_with_timeout!("#{gem_binary_path} install #{name} -q #{rdoc_string} -v \"#{version}\"#{src_str}#{opts}", env: nil)
            else
 -            shell_out_with_timeout!("#{gem_binary_path} install \"#{name}\" -q --no-rdoc --no-ri #{src_str}#{opts}", env: nil)
-+            shell_out_with_timeout!("#{gem_binary_path} install \"#{name}\" -q #{rdoc_string} --no-ri #{src_str}#{opts}", env: nil)
++            shell_out_with_timeout!("#{gem_binary_path} install \"#{name}\" -q #{rdoc_string} #{src_str}#{opts}", env: nil)
            end
          end
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chef.git/commitdiff/1b5b56da1bccaf5103bcef94e1235fa12c18dc84



More information about the pld-cvs-commit mailing list