From 9f77644df11049f4b204f3e130995b5fd54251b8 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 17 Nov 2021 16:29:58 +0300 Subject: [PATCH] AlmaLinux changes --- SOURCES/ruby-2.5.9-skip-test_execopts_gid.patch | 12 ++++++++++++ SPECS/ruby.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 SOURCES/ruby-2.5.9-skip-test_execopts_gid.patch diff --git a/SOURCES/ruby-2.5.9-skip-test_execopts_gid.patch b/SOURCES/ruby-2.5.9-skip-test_execopts_gid.patch new file mode 100644 index 0000000..2a0b314 --- /dev/null +++ b/SOURCES/ruby-2.5.9-skip-test_execopts_gid.patch @@ -0,0 +1,12 @@ +diff -uprN a/test/ruby/test_process.rb b/test/ruby/test_process.rb +--- a/test/ruby/test_process.rb 2021-07-07 13:21:03.853876760 +0300 ++++ b/test/ruby/test_process.rb 2021-07-07 13:24:29.883818358 +0300 +@@ -1852,7 +1852,7 @@ class TestProcess < Test::Unit::TestCase + end + + def test_execopts_gid +- skip "Process.groups not implemented on Windows platform" if windows? ++ skip "For ARM64 platform" + feature6975 = '[ruby-core:47414]' + + [30000, *Process.groups.map {|g| g = Etc.getgrgid(g); [g.name, g.gid]}].each do |group, gid| diff --git a/SPECS/ruby.spec b/SPECS/ruby.spec index fc59c29..d5d7495 100644 --- a/SPECS/ruby.spec +++ b/SPECS/ruby.spec @@ -75,7 +75,7 @@ Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version} -Release: %{release_string} +Release: %{release_string}.alma Group: Development/Languages # Public Domain for example for: include/ruby/st.h, strftime.c, missing/*, ... # MIT and CCO: ccan/* @@ -179,6 +179,9 @@ Patch28: ruby-2.5.9-revert-stop-the-error-due-to-openssl-1-1-1h.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1955010 Patch29: ruby-3.0.0-Convert-ip-addresses-to-canonical-form.patch +# AlmaLinux +Patch100: ruby-2.5.9-skip-test_execopts_gid.patch + Requires: %{name}-libs%{?_isa} = %{version}-%{release} Suggests: rubypick Recommends: ruby(rubygems) >= %{rubygems_version} @@ -577,6 +580,9 @@ sed -i 's/"evaluation\/incorrect_words.yaml"\.freeze, //' \ %patch27 -p1 %patch28 -p1 -R %patch29 -p1 +%ifarch aarch64 +%patch100 -p1 +%endif # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -1129,6 +1135,9 @@ OPENSSL_SYSTEM_CIPHERS_OVERRIDE=xyz_nonexistent_file OPENSSL_CONF='' \ %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog +* Wed Jul 07 2021 Sergey Fokin - 2.5.9-107.alma +- skip test_execopts_gid for ARM64 + * Mon Apr 19 2021 Pavel Valena - 2.5.9-107 - Update to Ruby 2.5.9. * Remove Patch20: ruby-2.6.0-rdoc-6.0.1-fix-template-typo.patch; subsumed