diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 8551d79..a54faff 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac index a64358fada..b3bdfad1eb 100644 --- a/configure.ac +++ b/configure.ac -@@ -3556,6 +3556,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3553,6 +3553,11 @@ AS_IF([test ${multiarch+set}], [ ]) archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index 045d6ae..b5d506c 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac index 2bc5153141..a64358fada 100644 --- a/configure.ac +++ b/configure.ac -@@ -4472,7 +4472,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4469,7 +4469,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 6ecfb2e..190108e 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac index b3bdfad1eb..411322a27f 100644 --- a/configure.ac +++ b/configure.ac -@@ -4536,6 +4536,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4533,6 +4533,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 diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index 969fefa..aae55fc 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac index 411322a27f..b5f842a512 100644 --- a/configure.ac +++ b/configure.ac -@@ -4508,6 +4508,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4505,6 +4505,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 411322a27f..b5f842a512 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4532,6 +4536,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4529,6 +4533,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index 2eb5d00..e3e49ea 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac index 2bbce78fd0..9d8662369c 100644 --- a/configure.ac +++ b/configure.ac -@@ -4422,9 +4422,6 @@ AS_CASE(["$target_os"], +@@ -4419,9 +4419,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index 2bbce78fd0..9d8662369c 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4447,57 +4444,63 @@ AC_ARG_WITH(ridir, +@@ -4444,57 +4441,63 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -122,7 +122,7 @@ index 2bbce78fd0..9d8662369c 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4514,6 +4517,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4511,6 +4514,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl @@ -212,7 +212,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 74c8953904..1f3bd91d51 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb -@@ -1339,7 +1339,8 @@ def test_self_use_paths +@@ -1365,7 +1365,8 @@ def test_self_use_paths def test_self_user_dir parts = [@userhome, ".gem", Gem.ruby_engine] @@ -222,7 +222,7 @@ index 74c8953904..1f3bd91d51 100644 FileUtils.mkdir_p File.join(parts) -@@ -1415,7 +1416,7 @@ def test_self_vendor_dir +@@ -1441,7 +1442,7 @@ def test_self_vendor_dir vendordir(File.join(@tempdir, "vendor")) do expected = File.join RbConfig::CONFIG["vendordir"], "gems", diff --git a/ruby-4.0.1-Support-customizable-rustc_flags-for-rustc-builds.patch b/ruby-4.0.1-Support-customizable-rustc_flags-for-rustc-builds.patch index 8238b58..3d16ff2 100644 --- a/ruby-4.0.1-Support-customizable-rustc_flags-for-rustc-builds.patch +++ b/ruby-4.0.1-Support-customizable-rustc_flags-for-rustc-builds.patch @@ -55,7 +55,7 @@ index 2bbce78fd0..a3aa6dc383 100644 [begin]_group "environment section" && { HAVE_BASERUBY=yes -@@ -4054,6 +4055,11 @@ AS_CASE(["${ZJIT_SUPPORT}"], +@@ -4051,6 +4054,11 @@ AS_CASE(["${ZJIT_SUPPORT}"], AC_DEFINE(USE_ZJIT, 0) ]) @@ -67,7 +67,7 @@ index 2bbce78fd0..a3aa6dc383 100644 JIT_RUST_FLAGS='--crate-type=staticlib --cfg feature=\"stats_allocator\"' RLIB_DIR= AS_CASE(["$JIT_CARGO_SUPPORT:$YJIT_SUPPORT:$ZJIT_SUPPORT"], -@@ -4111,6 +4117,7 @@ AS_IF([test -n "$RUST_LIB"], [ +@@ -4108,6 +4114,7 @@ AS_IF([test -n "$RUST_LIB"], [ dnl These variables end up in ::RbConfig::CONFIG AC_SUBST(RUSTC)dnl Rust compiler command AC_SUBST(JIT_RUST_FLAGS)dnl the common rustc flags for JIT crates such as zjit @@ -75,7 +75,7 @@ index 2bbce78fd0..a3aa6dc383 100644 AC_SUBST(CARGO)dnl Cargo command for Rust builds AC_SUBST(CARGO_BUILD_ARGS)dnl for selecting Rust build profiles AC_SUBST(YJIT_SUPPORT)dnl what flavor of YJIT the Ruby build includes -@@ -4855,6 +4862,7 @@ config_summary "strip command" "$STRIP" +@@ -4852,6 +4859,7 @@ config_summary "strip command" "$STRIP" config_summary "install doc" "$DOCTARGETS" config_summary "YJIT support" "$YJIT_SUPPORT" config_summary "ZJIT support" "$ZJIT_SUPPORT" diff --git a/ruby.spec b/ruby.spec index f9af9ea..9b7e201 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 4 %global minor_version 0 -%global teeny_version 1 +%global teeny_version 5 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -36,19 +36,19 @@ ## BUNDLED_GEMS_VERSIONS # Bundled libraries versions -%global rubygems_version 4.0.3 +%global rubygems_version 4.0.10 %global rubygems_molinillo_version 0.8.0 %global rubygems_net_http_version 0.7.0 %global rubygems_net_protocol_version 0.2.2 %global rubygems_optparse_version 0.8.0 -%global rubygems_resolv_version 0.6.2 +%global rubygems_resolv_version 0.7.0 %global rubygems_securerandom_version 0.4.1 %global rubygems_timeout_version 0.4.4 %global rubygems_tsort_version 0.2.0 %global rubygems_uri_version 1.1.1 # Default gems. -%global bundler_version 4.0.3 +%global bundler_version 4.0.10 %global bundler_connection_pool_version 2.5.4 %global bundler_fileutils_version 1.8.0 %global bundler_net_http_persistent_version 4.0.6 @@ -63,7 +63,7 @@ %global did_you_mean_version 2.0.0 %global digest_version 3.2.1 %global english_version 0.8.1 -%global erb_version 6.0.1 +%global erb_version 6.0.1.1 %global error_highlight_version 0.7.1 %global etc_version 1.4.6 %global fcntl_version 1.3.0 @@ -83,7 +83,7 @@ %global optparse_version 0.8.1 %global pp_version 0.6.3 %global prettyprint_version 0.2.0 -%global prism_version 1.8.0 +%global prism_version 1.8.1 %global psych_version 5.3.1 %global resolv_version 0.7.0 %global ruby2_keywords_version 0.0.5 @@ -92,7 +92,7 @@ %global singleton_version 0.3.0 %global stringio_version 3.2.0 %global strscan_version 3.1.6 -%global syntax_suggest_version 2.0.2 +%global syntax_suggest_version 2.0.3 %global tempfile_version 0.3.1 %global time_version 0.4.2 %global timeout_version 0.6.0 @@ -103,7 +103,7 @@ %global weakref_version 0.1.4 %global win32_registry_version 0.1.2 %global yaml_version 0.4.0 -%global zlib_version 3.2.2 +%global zlib_version 3.2.3 # Bundled gems. %global abbrev_version 0.1.2 @@ -129,11 +129,11 @@ %global ostruct_version 0.6.3 %global power_assert_version 3.0.1 %global prime_version 0.1.4 -%global pstore_version 0.2.0 +%global pstore_version 0.2.1 %global racc_version 1.8.1 %global rake_version 13.3.1 %global rbs_version 3.10.0 -%global rdoc_version 7.0.3 +%global rdoc_version 7.0.4 %global readline_version 0.0.4 %global reline_version 0.6.3 %global repl_type_completor_version 0.1.12 @@ -190,7 +190,7 @@ Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version}%{?development_release} -Release: 32%{?dist} +Release: 33%{?dist} # Licenses, which are likely not included in binary RPMs: # Apache-2.0: # benchmark/gc/redblack.rb @@ -297,6 +297,7 @@ Patch7: ruby-3.3.0-Disable-syntax-suggest-test-case.patch Patch8: ruby-4.0.1-Support-customizable-rustc_flags-for-rustc-builds.patch # https://github.com/ruby/rdoc/pull/1531 # Fix error with `gem install --document=rdoc,ri` +# Fixed in rdoc 7.1.0 but not in 7.0.4 Patch9: rdoc-pr1531-fix-mutilple-document-installation.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -1527,7 +1528,6 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %files doc -f .ruby-doc.en -f .ruby-doc.ja %doc README.md -%doc ChangeLog %{?with_systemtap:%doc ruby-exercise.stp} %{_datadir}/ri @@ -1959,6 +1959,9 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %changelog +* Mon Jun 08 2026 Mamoru TASAKA - 4.0.5-33 +- Update to Ruby 4.0.5 + * Sat Jan 17 2026 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild diff --git a/sources b/sources index f1f97eb..ee8a6e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruby-4.0.1.tar.xz) = b67d9d1f97ba30200d103f8454e39dc2d0450819d51d91eb5451d44b0bafc56d2fa48bb1be6c5081babe5828f679984bad02b9bcee7441f6bd34c0a95b8f200b +SHA512 (ruby-4.0.5.tar.xz) = 379d78a6d1af0455df60da46551f43438ad3ee81f83787554fc34cb1c8febb1bd363e3dc1a057b34a69f96526efc308d3dccc4b87d368897c2d1ccf179096463