Upgrade to Ruby 3.0.5.
This commit is contained in:
parent
a90e12d412
commit
11193feb52
8 changed files with 25 additions and 18 deletions
|
|
@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
|
|||
index d261ea57b5..3c13076b82 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3240,6 +3240,11 @@ AS_IF([test ${multiarch+set}], [
|
||||
@@ -3259,6 +3259,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
|
||||
@@ -3886,7 +3886,8 @@ AS_CASE(["$ruby_version_dir_name"],
|
||||
@@ -3905,7 +3905,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
|
||||
@@ -3950,6 +3950,8 @@ AC_SUBST(vendorarchdir)dnl
|
||||
@@ -3969,6 +3969,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
|
||||
@@ -3922,6 +3922,10 @@ AC_ARG_WITH(vendorarchdir,
|
||||
@@ -3941,6 +3941,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=''
|
||||
@@ -3946,6 +3950,7 @@ AC_SUBST(sitearchdir)dnl
|
||||
@@ -3965,6 +3969,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
|
||||
@@ -3837,9 +3837,6 @@ AS_CASE(["$target_os"],
|
||||
@@ -3856,9 +3856,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],
|
||||
@@ -3862,56 +3859,62 @@ AC_ARG_WITH(ridir,
|
||||
@@ -3881,56 +3878,62 @@ AC_ARG_WITH(ridir,
|
||||
AC_SUBST(ridir)
|
||||
AC_SUBST(RI_BASE_NAME)
|
||||
|
||||
|
|
@ -120,7 +120,7 @@ index 80b137e380..63cd3b4f8b 100644
|
|||
|
||||
AS_IF([test "${LOAD_RELATIVE+set}"], [
|
||||
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
|
||||
@@ -3928,6 +3931,7 @@ AC_SUBST(sitearchincludedir)dnl
|
||||
@@ -3947,6 +3950,7 @@ AC_SUBST(sitearchincludedir)dnl
|
||||
AC_SUBST(arch)dnl
|
||||
AC_SUBST(sitearch)dnl
|
||||
AC_SUBST(ruby_version)dnl
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ diff --git a/ruby.c b/ruby.c
|
|||
index 60c57d6259..1eec16f2c8 100644
|
||||
--- a/ruby.c
|
||||
+++ b/ruby.c
|
||||
@@ -1489,10 +1489,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
|
||||
@@ -1501,10 +1501,14 @@ proc_options(long argc, char **argv, ruby_cmdline_options_t *opt, int envopt)
|
||||
|
||||
void Init_builtin_features(void);
|
||||
|
||||
|
|
|
|||
|
|
@ -21,8 +21,11 @@ diff --git a/spec/ruby/core/time/shared/local.rb b/spec/ruby/core/time/shared/lo
|
|||
index 43f331c4c..c4aa7a7ea 100644
|
||||
--- a/spec/ruby/core/time/shared/local.rb
|
||||
+++ b/spec/ruby/core/time/shared/local.rb
|
||||
@@ -8,10 +8,10 @@ describe :time_local, shared: true do
|
||||
@@ -6,18 +6,16 @@ describe :time_local, shared: true do
|
||||
end
|
||||
end
|
||||
|
||||
-=begin
|
||||
platform_is_not :windows do
|
||||
describe "timezone changes" do
|
||||
- it "correctly adjusts the timezone change to 'CEST' on 'Europe/Amsterdam'" do
|
||||
|
|
@ -35,6 +38,11 @@ index 43f331c4c..c4aa7a7ea 100644
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
-=end
|
||||
end
|
||||
|
||||
describe :time_local_10_arg, shared: true do
|
||||
--
|
||||
2.36.1
|
||||
|
||||
|
|
|
|||
15
ruby.spec
15
ruby.spec
|
|
@ -1,6 +1,6 @@
|
|||
%global major_version 3
|
||||
%global minor_version 0
|
||||
%global teeny_version 4
|
||||
%global teeny_version 5
|
||||
%global major_minor_version %{major_version}.%{minor_version}
|
||||
|
||||
%global ruby_version %{major_minor_version}.%{teeny_version}
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
%endif
|
||||
|
||||
|
||||
%global release 154
|
||||
%global release 155
|
||||
%{!?release_string:%define release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
|
||||
|
||||
# The RubyGems library has to stay out of Ruby directory tree, since the
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
%global io_console_version 0.5.7
|
||||
%global irb_version 1.3.5
|
||||
%global json_version 2.5.1
|
||||
%global openssl_version 2.2.1
|
||||
%global openssl_version 2.2.2
|
||||
%global psych_version 3.3.2
|
||||
%global racc_version 1.5.2
|
||||
%global rdoc_version 6.3.3
|
||||
|
|
@ -165,9 +165,6 @@ Patch22: rubygems-3.2.33-Fix-loading-operating_system-rb-customizations-too-late
|
|||
# Fix tests with Europe/Amsterdam pre-1970 time on tzdata version 2022b.
|
||||
# https://github.com/ruby/spec/pull/939
|
||||
Patch26: ruby-spec-Fix-tests-on-tzdata-2022b.patch
|
||||
# Bypass git submodule test failure on Git >= 2.38.1.
|
||||
# https://github.com/ruby/ruby/pull/6587
|
||||
Patch29: ruby-3.2.0-git-2.38.1-fix-rubygems-test.patch
|
||||
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Suggests: rubypick
|
||||
|
|
@ -617,7 +614,6 @@ rm -rf ext/fiddle/libffi*
|
|||
%patch20 -p1
|
||||
%patch22 -p1
|
||||
%patch26 -p1
|
||||
%patch29 -p1
|
||||
|
||||
# Provide an example of usage of the tapset:
|
||||
cp -a %{SOURCE3} .
|
||||
|
|
@ -1157,7 +1153,7 @@ MSPECOPTS=""
|
|||
%{gem_dir}/specifications/default/abbrev-0.1.0.gemspec
|
||||
%{gem_dir}/specifications/default/base64-0.1.0.gemspec
|
||||
%{gem_dir}/specifications/default/benchmark-0.1.1.gemspec
|
||||
%{gem_dir}/specifications/default/cgi-0.2.1.gemspec
|
||||
%{gem_dir}/specifications/default/cgi-0.2.2.gemspec
|
||||
%{gem_dir}/specifications/default/csv-3.1.9.gemspec
|
||||
%{gem_dir}/specifications/default/date-3.1.3.gemspec
|
||||
%{gem_dir}/specifications/default/dbm-1.1.0.gemspec
|
||||
|
|
@ -1373,6 +1369,9 @@ MSPECOPTS=""
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 30 2022 Vít Ondruch <vondruch@redhat.com> - 3.0.4-155
|
||||
- Upgrade to Ruby 3.0.5.
|
||||
|
||||
* Fri Nov 04 2022 Jun Aruga <jaruga@redhat.com> - 3.0.4-154
|
||||
- Fix tests with Europe/Amsterdam pre-1970 time on tzdata version 2022b.
|
||||
Resolves: rhbz#2120354
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue