!4 [sync] PR-3: Fix rubygem-expression_parser test failure caused by ruby upgrade to 3.2.2

From: @openeuler-sync-bot 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
This commit is contained in:
openeuler-ci-bot 2023-08-11 09:04:44 +00:00 committed by Gitee
commit e0e4e3da59
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 18 additions and 1 deletions

View File

@ -0,0 +1,12 @@
diff -Naur a/lib/rspec/core/ruby_project.rb b/lib/rspec/core/ruby_project.rb
--- a/lib/rspec/core/ruby_project.rb 2023-08-11 16:28:19.863503691 +0800
+++ b/lib/rspec/core/ruby_project.rb 2023-08-11 16:29:29.028511667 +0800
@@ -24,7 +24,7 @@
end
def find_first_parent_containing(dir)
- ascend_until {|path| File.exists?(File.join(path, dir))}
+ ascend_until {|path| File.exist?(File.join(path, dir))}
end
def ascend_until

View File

@ -8,7 +8,7 @@
Summary: Rspec 2 runner and formatters Summary: Rspec 2 runner and formatters
Name: rubygem-%{rpmgem_name} Name: rubygem-%{rpmgem_name}
Version: %{majorver} Version: %{majorver}
Release: 2 Release: 3
License: MIT License: MIT
URL: http://github.com/rspec/rspec-core URL: http://github.com/rspec/rspec-core
Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem
@ -17,6 +17,7 @@ Patch0: rubygem-rspec-core-2.14.8-ruby24.patch
# F-26 uses aruba 0.14.x, which uses rspec3 and so incompatible with rspec2. # F-26 uses aruba 0.14.x, which uses rspec3 and so incompatible with rspec2.
# Remove aruba dependency # Remove aruba dependency
Patch1: rubygem-rspec-core-2.14.8-remove-aruba-dependency.patch Patch1: rubygem-rspec-core-2.14.8-remove-aruba-dependency.patch
Patch2: Fix-rubygem-expression_parser-test-failure.patch
Source1: rspec2 Source1: rspec2
BuildRequires: ruby(release) rubygems-devel BuildRequires: ruby(release) rubygems-devel
%if 0%{?need_bootstrap_set} < 1 %if 0%{?need_bootstrap_set} < 1
@ -48,6 +49,7 @@ sed -i \
spec/support/helper_methods.rb spec/support/helper_methods.rb
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%build %build
@ -106,6 +108,9 @@ popd
%exclude %{gem_instdir}/spec/ %exclude %{gem_instdir}/spec/
%changelog %changelog
* Fri Aug 11 2023 yaoxin <yao_xin001@hoperun.com> - 2.14.8-3
- Fix rubygem-expression_parser test failure caused by ruby upgrade to 3.2.2
* Mon Sep 7 2020 liyanan <liyanan32@huawei.com> - 2.14.8-2 * Mon Sep 7 2020 liyanan <liyanan32@huawei.com> - 2.14.8-2
- fix build fail - fix build fail