From 5cfd2aaf3ad417b3bcb35ee94f3b27b0bed5fa87 Mon Sep 17 00:00:00 2001 From: Chunmei Xu Date: Tue, 28 Mar 2023 10:51:56 +0800 Subject: [PATCH] remove multilib related codes Signed-off-by: Chunmei Xu --- ruby.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ruby.spec b/ruby.spec index f83c45a..a0f974e 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ # PLEASE ALWAYS bump release even when upgrading version, as this package is # producing rubygem packages with different versions other than main package. -%define anolis_release 4 +%define anolis_release 5 %global major_version 3 %global minor_version 1 %global teeny_version 3 @@ -199,7 +199,6 @@ BuildRequires: procps # Required to test hardening. %{?with_hardening_test:BuildRequires: %{_bindir}/checksec} %{?with_hostname:BuildRequires: %{_bindir}/hostname} -BuildRequires: multilib-rpm-config BuildRequires: gcc BuildRequires: make BuildRequires: zlib-devel @@ -691,13 +690,6 @@ rm -rf %{buildroot} # TODO: Regenerate RBS parser in lib/rbs/parser.rb -# Rename ruby/config.h to ruby/config-.h to avoid file conflicts on -# multilib systems and install config.h wrapper -%multilib_fix_c_header --file %{_includedir}/%{name}/config.h -# TODO: The correct patch should be %%{_includedir}/%%{name}/rb_mjit_min_header-%%{ruby_version}.h -# https://bugs.ruby-lang.org/issues/15425 -%multilib_fix_c_header --file %{_includedir}/rb_mjit_min_header-%{ruby_version}.h - # Rename the ruby executable. It is replaced by RubyPick. %{?with_rubypick:mv %{buildroot}%{_bindir}/%{name}{,-mri}} @@ -1521,6 +1513,9 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/" %changelog +* Tue Mar 28 2023 Chunmei Xu - 3.1.3-5 +- remove multilib related codes + * Thu Mar 9 2023 Chunmei Xu - 3.1.3-4 - use system-rpm-config as Requires -- Gitee