Upgrade to Ruby 3.2.0 (66e5200ba4).
This commit is contained in:
parent
d91b12025c
commit
aca80a24c1
7 changed files with 36 additions and 24 deletions
|
|
@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index d261ea57b5..3c13076b82 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3395,6 +3395,11 @@ AS_IF([test ${multiarch+set}], [
|
||||
@@ -3401,6 +3401,11 @@ AS_IF([test ${multiarch+set}], [
|
||||
])
|
||||
|
||||
archlibdir='${libdir}/${arch}'
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index c42436c23d..d261ea57b5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4130,7 +4130,8 @@ AS_CASE(["$ruby_version_dir_name"],
|
||||
@@ -4178,7 +4178,8 @@ AS_CASE(["$ruby_version_dir_name"],
|
||||
ruby_version_dir=/'${ruby_version_dir_name}'
|
||||
|
||||
if test -z "${ruby_version_dir_name}"; then
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 3c13076b82..93af30321d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4194,6 +4194,8 @@ AC_SUBST(vendorarchdir)dnl
|
||||
@@ -4242,6 +4242,8 @@ AC_SUBST(vendorarchdir)dnl
|
||||
AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
|
||||
AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 93af30321d..bc13397e0e 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4166,6 +4166,10 @@ AC_ARG_WITH(vendorarchdir,
|
||||
@@ -4214,6 +4214,10 @@ AC_ARG_WITH(vendorarchdir,
|
||||
[vendorarchdir=$withval],
|
||||
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ index 93af30321d..bc13397e0e 100644
|
|||
AS_IF([test "${LOAD_RELATIVE+set}"], [
|
||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||
RUBY_EXEC_PREFIX=''
|
||||
@@ -4190,6 +4194,7 @@ AC_SUBST(sitearchdir)dnl
|
||||
@@ -4238,6 +4242,7 @@ AC_SUBST(sitearchdir)dnl
|
||||
AC_SUBST(vendordir)dnl
|
||||
AC_SUBST(vendorlibdir)dnl
|
||||
AC_SUBST(vendorarchdir)dnl
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index 80b137e380..63cd3b4f8b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4080,9 +4080,6 @@ AS_CASE(["$target_os"],
|
||||
@@ -4128,9 +4128,6 @@ AS_CASE(["$target_os"],
|
||||
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
|
||||
])
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ index 80b137e380..63cd3b4f8b 100644
|
|||
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
|
||||
AC_ARG_WITH(rubyarchprefix,
|
||||
AS_HELP_STRING([--with-rubyarchprefix=DIR],
|
||||
@@ -4105,57 +4102,63 @@ AC_ARG_WITH(ridir,
|
||||
@@ -4153,57 +4150,63 @@ AC_ARG_WITH(ridir,
|
||||
AC_SUBST(ridir)
|
||||
AC_SUBST(RI_BASE_NAME)
|
||||
|
||||
|
|
@ -122,7 +122,7 @@ index 80b137e380..63cd3b4f8b 100644
|
|||
|
||||
AS_IF([test "${LOAD_RELATIVE+set}"], [
|
||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||
@@ -4172,6 +4175,7 @@ AC_SUBST(sitearchincludedir)dnl
|
||||
@@ -4220,6 +4223,7 @@ AC_SUBST(sitearchincludedir)dnl
|
||||
AC_SUBST(arch)dnl
|
||||
AC_SUBST(sitearch)dnl
|
||||
AC_SUBST(ruby_version)dnl
|
||||
|
|
@ -219,7 +219,7 @@ index d4ff4a262c..3f9a5bf590 100644
|
|||
File.join parts
|
||||
end
|
||||
|
||||
@@ -234,7 +235,7 @@ def self.vendor_dir # :nodoc:
|
||||
@@ -248,7 +249,7 @@ def self.vendor_dir # :nodoc:
|
||||
return nil unless RbConfig::CONFIG.key? "vendordir"
|
||||
|
||||
File.join RbConfig::CONFIG["vendordir"], "gems",
|
||||
|
|
@ -269,7 +269,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index a00f2b6776..999e2d6d5d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -123,7 +123,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
|
||||
@@ -124,7 +124,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
|
||||
RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
|
||||
AC_SUBST(RUBY_BASE_NAME)
|
||||
AC_SUBST(RUBYW_BASE_NAME)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ diff --git a/vm.c b/vm.c
|
|||
index 8ce8b279d4..3d189fa63a 100644
|
||||
--- a/vm.c
|
||||
+++ b/vm.c
|
||||
@@ -574,7 +574,15 @@ rb_dtrace_setup(rb_execution_context_t *ec, VALUE klass, ID id,
|
||||
@@ -547,7 +547,15 @@ rb_dtrace_setup(rb_execution_context_t *ec, VALUE klass, ID id,
|
||||
}
|
||||
type = BUILTIN_TYPE(klass);
|
||||
if (type == T_CLASS || type == T_ICLASS || type == T_MODULE) {
|
||||
|
|
|
|||
38
ruby.spec
38
ruby.spec
|
|
@ -10,7 +10,7 @@
|
|||
#%%global milestone rc1
|
||||
|
||||
# Keep the revision enabled for pre-releases from GIT.
|
||||
%global revision 6bf458eefd
|
||||
%global revision 66e5200ba4
|
||||
|
||||
%global ruby_archive %{name}-%{ruby_version}
|
||||
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
%global bundler_version 2.4.0.dev
|
||||
%global bundler_connection_pool_version 2.3.0
|
||||
%global bundler_fileutils_version 1.4.1
|
||||
%global bundler_molinillo_version 0.8.0
|
||||
%global bundler_pub_grub_version 0.5.0
|
||||
%global bundler_net_http_persistent_version 4.0.1
|
||||
%global bundler_thor_version 1.2.1
|
||||
%global bundler_tmpdir_version 0.1.0
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
%global did_you_mean_version 1.6.1
|
||||
%global erb_version 3.0.0
|
||||
%global io_console_version 0.5.11
|
||||
%global irb_version 1.4.2
|
||||
%global irb_version 1.5.0
|
||||
%global json_version 2.6.2
|
||||
%global openssl_version 3.1.0.pre
|
||||
%global psych_version 5.0.0.dev
|
||||
|
|
@ -434,7 +434,7 @@ Provides: rubygem(bundler) = %{version}-%{release}
|
|||
# https://github.com/bundler/bundler/issues/3647
|
||||
Provides: bundled(rubygem-connection_pool) = %{bundler_connection_pool_version}
|
||||
Provides: bundled(rubygem-fileutils) = %{bundler_fileutils_version}
|
||||
Provides: bundled(rubygem-molinillo) = %{bundler_molinillo_version}
|
||||
Provides: bundled(rubygem-pub_grub) = %{bundler_pub_grub_version}
|
||||
Provides: bundled(rubygem-net-http-persisntent) = %{bundler_net_http_persistent_version}
|
||||
Provides: bundled(rubygem-thor) = %{bundler_thor_version}
|
||||
Provides: bundled(rubygem-tmpdir) = %{bundler_tmpdir_version}
|
||||
|
|
@ -889,13 +889,13 @@ make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
|
|||
exit 1 if Bundler::FileUtils::VERSION != '%{bundler_fileutils_version}'; \
|
||||
\""
|
||||
|
||||
# Molinillo.
|
||||
# PubGrub
|
||||
make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \
|
||||
module Bundler; end; \
|
||||
require 'bundler/vendor/molinillo/lib/molinillo/gem_metadata'; \
|
||||
puts '%%{bundler_molinillo_version}: %{bundler_molinillo_version}'; \
|
||||
puts %Q[Bundler::Molinillo::VERSION: #{Bundler::Molinillo::VERSION}]; \
|
||||
exit 1 if Bundler::Molinillo::VERSION != '%{bundler_molinillo_version}'; \
|
||||
require 'bundler/vendor/pub_grub/lib/pub_grub/version'; \
|
||||
puts '%%{bundler_pub_grub_version}: %{bundler_pub_grub_version}'; \
|
||||
puts %Q[Bundler::PubGrub::VERSION: #{Bundler::PubGrub::VERSION}]; \
|
||||
exit 1 if Bundler::PubGrub::VERSION != '%{bundler_pub_grub_version}'; \
|
||||
\""
|
||||
|
||||
# Net::HTTP::Persistent.
|
||||
|
|
@ -972,6 +972,17 @@ MSPECOPTS=""
|
|||
DISABLE_TESTS="$DISABLE_TESTS -n !/TestReadline#test_interrupt_in_other_thread/"
|
||||
%endif
|
||||
|
||||
# Test timeouts for some reason.
|
||||
# https://bugs.ruby-lang.org/issues/19145
|
||||
DISABLE_TESTS="$DISABLE_TESTS -n !/TestException#test_exception_in_message/"
|
||||
|
||||
%ifarch i686
|
||||
# i686 specific failures.
|
||||
# https://bugs.ruby-lang.org/issues/19147
|
||||
DISABLE_TESTS="$DISABLE_TESTS -n !/TestFileExhaustive#test_expand_path_for_existent_username/"
|
||||
DISABLE_TESTS="$DISABLE_TESTS -n !/TestDir#test_home/"
|
||||
%endif
|
||||
|
||||
# Several test broken by libffi-3.4.2. There should be fix in libffi, once
|
||||
# other components are fixed.
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2040380
|
||||
|
|
@ -1170,6 +1181,7 @@ mv test/fiddle/test_import.rb{,.disable}
|
|||
%{ruby_libarchdir}/enc/windows_1254.so
|
||||
%{ruby_libarchdir}/enc/windows_1257.so
|
||||
%{ruby_libarchdir}/enc/windows_31j.so
|
||||
%{ruby_libarchdir}/erb.so
|
||||
%{ruby_libarchdir}/etc.so
|
||||
%{ruby_libarchdir}/fcntl.so
|
||||
%{ruby_libarchdir}/fiddle.so
|
||||
|
|
@ -1235,7 +1247,7 @@ mv test/fiddle/test_import.rb{,.disable}
|
|||
%{gem_dir}/specifications/default/abbrev-0.1.0.gemspec
|
||||
%{gem_dir}/specifications/default/base64-0.1.1.gemspec
|
||||
%{gem_dir}/specifications/default/benchmark-0.2.0.gemspec
|
||||
%{gem_dir}/specifications/default/cgi-0.3.3.gemspec
|
||||
%{gem_dir}/specifications/default/cgi-0.3.5.gemspec
|
||||
%{gem_dir}/specifications/default/csv-3.2.2.gemspec
|
||||
%{gem_dir}/specifications/default/date-3.2.3.gemspec
|
||||
%{gem_dir}/specifications/default/delegate-0.2.0.gemspec
|
||||
|
|
@ -1244,7 +1256,7 @@ mv test/fiddle/test_import.rb{,.disable}
|
|||
%{gem_dir}/specifications/default/drb-2.1.0.gemspec
|
||||
%{gem_dir}/specifications/default/english-0.7.1.gemspec
|
||||
%{gem_dir}/specifications/default/erb-%{erb_version}.gemspec
|
||||
%{gem_dir}/specifications/default/error_highlight-0.4.0.gemspec
|
||||
%{gem_dir}/specifications/default/error_highlight-0.5.1.gemspec
|
||||
%{gem_dir}/specifications/default/etc-1.4.0.gemspec
|
||||
%{gem_dir}/specifications/default/fcntl-1.0.1.gemspec
|
||||
%{gem_dir}/specifications/default/fiddle-1.1.1.gemspec
|
||||
|
|
@ -1530,8 +1542,8 @@ mv test/fiddle/test_import.rb{,.disable}
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Oct 12 2022 Vít Ondruch <vondruch@redhat.com> - 3.2.0-1
|
||||
- Upgrade to Ruby 3.2.0 (6bf458eefd).
|
||||
* Thu Nov 24 2022 Vít Ondruch <vondruch@redhat.com> - 3.2.0-1
|
||||
- Upgrade to Ruby 3.2.0 (66e5200ba4).
|
||||
|
||||
* Mon Aug 29 2022 Jun Aruga <jaruga@redhat.com> - 3.1.2-168
|
||||
- Make RDoc soft dependnecy in IRB.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue