diff --git a/ruby.spec b/ruby.spec index 17f50d9..e8b11d1 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from GIT. -%global revision e3631277c3 +%global revision 04f7be6126 %global ruby_archive %{name}-%{ruby_version} @@ -31,20 +31,20 @@ %global rubygems_molinillo_version 0.8.0 %global rubygems_net_http_version 0.4.0 %global rubygems_net_protocol_version 0.2.2 -%global rubygems_optparse_version 0.3.0 -%global rubygems_resolv_version 0.2.2 +%global rubygems_optparse_version 0.4.0 +%global rubygems_resolv_version 0.3.0 %global rubygems_timeout_version 0.4.1 -%global rubygems_tsort_version 0.1.0 +%global rubygems_tsort_version 0.2.0 # Default gems. %global bundler_version 2.5.0.dev -%global bundler_connection_pool_version 2.3.0 -%global bundler_fileutils_version 1.7.0 +%global bundler_connection_pool_version 2.4.1 +%global bundler_fileutils_version 1.7.2 %global bundler_net_http_persistent_version 4.0.2 %global bundler_pub_grub_version 0.5.0 %global bundler_thor_version 1.3.0 -%global bundler_tsort_version 0.1.1 -%global bundler_uri_version 0.12.2 +%global bundler_tsort_version 0.2.0 +%global bundler_uri_version 0.13.0 %global abbrev_version 0.1.1 %global base64_version 0.2.0 @@ -108,7 +108,7 @@ %global weakref_version 0.1.3 %global win32ole_version 1.8.10 %global yaml_version 0.3.0 -%global prism_version 0.18.0 +%global prism_version 0.19.0 %global zlib_version 3.1.0 # Gemified default gems. @@ -126,7 +126,7 @@ %global test_unit_version 3.6.1 %global rexml_version 3.2.6 %global rss_version 0.3.0 -%global net_ftp_version 0.3.2 +%global net_ftp_version 0.3.3 %global net_imap_version 0.4.8 %global net_pop_version 0.1.2 %global net_smtp_version 0.4.0 @@ -923,14 +923,12 @@ make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \ \"" # Resolv. -# TODO: The version is not available in Resolv 2.2.0 yet: -# https://github.com/ruby/resolv/commit/6ab2385e89ba0462c5d7f12a88a6d8f372cdbc60 make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \ module Gem; end; \ require 'rubygems/resolv/lib/resolv'; \ -# puts '%%{rubygems_resolv_version}: %{rubygems_resolv_version}'; \ -# puts %Q[Gem::Resolv::VERSION: #{Gem::Resolv::VERSION}]; \ -# exit 1 if Gem::Resolve::VERSION != '%{rubygems_resolv_version}'; \ + puts '%%{rubygems_resolv_version}: %{rubygems_resolv_version}'; \ + puts %Q[Gem::Resolv::VERSION: #{Gem::Resolv::VERSION}]; \ + exit 1 if Gem::Resolv::VERSION != '%{rubygems_resolv_version}'; \ \"" # Timeout. @@ -942,12 +940,14 @@ make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \ exit 1 if Gem::Timeout::VERSION != '%{rubygems_timeout_version}'; \ \"" -# tsort -# TODO: Provide some real version test if version is available: -# https://github.com/ruby/tsort/commit/09f22759580d25aee3962e46966ebd908d618c80 +# TSort make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \ - module Gem; end;\ - require 'rubygems/tsort/lib/tsort'\"" + module Gem; end; \ + require 'rubygems/tsort/lib/tsort'; \ + puts '%%{rubygems_tsort_version}: %{rubygems_tsort_version}'; \ + puts %Q[Gem::TSort::VERSION: #{Gem::TSort::VERSION}]; \ + exit 1 if Gem::TSort::VERSION != '%{rubygems_tsort_version}'; \ +\"" # Check Bundler bundled dependencies versions. @@ -997,13 +997,14 @@ make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \ exit 1 if Bundler::Thor::VERSION != '%{bundler_thor_version}'; \ \"" -# tsort -# TODO: Provide some real version test if version is available: -# https://github.com/ruby/tsort/commit/09f22759580d25aee3962e46966ebd908d618c80 -#%%{global bundler_tsort_version} +# TSort make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \ module Bundler; end; \ - require 'bundler/vendor/tsort/lib/tsort' \"" + require 'bundler/vendor/tsort/lib/tsort'; \ + puts '%%{bundler_tsort_version}: %{bundler_tsort_version}'; \ + puts %Q[Bundler::TSort::VERSION: #{Bundler::TSort::VERSION}]; \ + exit 1 if Bundler::TSort::VERSION != '%{bundler_tsort_version}'; \ +\"" # URI. make -C %{_vpath_builddir} -s runruby TESTRUN_SCRIPT="-e \" \ @@ -1609,8 +1610,8 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \ %changelog -* Thu Dec 14 2023 Vít Ondruch - 3.3.0-184 -- Upgrade to Ruby 3.3.0 (e3631277c3). +* Fri Dec 15 2023 Vít Ondruch - 3.3.0-184 +- Upgrade to Ruby 3.3.0 (04f7be6126). * Thu Nov 09 2023 Jun Aruga - 3.2.2-183 - ssl: use ffdhe2048 from RFC 7919 as the default DH group parameters