diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 65882be..2646a80 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 d261ea57b5..3c13076b82 100644 --- a/configure.ac +++ b/configure.ac -@@ -3410,6 +3410,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3411,6 +3411,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 2a6261b..6f2fbe7 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 c42436c23d..d261ea57b5 100644 --- a/configure.ac +++ b/configure.ac -@@ -4195,7 +4195,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4196,7 +4196,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 05bbd3a..f94b656 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 3c13076b82..93af30321d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4259,6 +4259,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4260,6 +4260,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 e57500c..0cb2012 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 93af30321d..bc13397e0e 100644 --- a/configure.ac +++ b/configure.ac -@@ -4231,6 +4231,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4232,6 +4232,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='' -@@ -4255,6 +4259,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4256,6 +4260,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 42f347f..866fef4 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 80b137e380..63cd3b4f8b 100644 --- a/configure.ac +++ b/configure.ac -@@ -4145,9 +4145,6 @@ AS_CASE(["$target_os"], +@@ -4146,9 +4146,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], -@@ -4170,57 +4167,63 @@ AC_ARG_WITH(ridir, +@@ -4171,57 +4168,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) -@@ -4237,6 +4240,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4238,6 +4241,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl diff --git a/ruby.spec b/ruby.spec index 04271e6..54096c6 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 3 %global minor_version 2 -%global teeny_version 1 +%global teeny_version 2 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -27,20 +27,20 @@ %global rubygems_dir %{_datadir}/rubygems # Bundled libraries versions -%global rubygems_version 3.4.6 +%global rubygems_version 3.4.10 %global rubygems_molinillo_version 0.8.0 %global rubygems_optparse_version 0.3.0 %global rubygems_tsort_version 0.1.0 # Default gems. -%global bundler_version 2.4.6 +%global bundler_version 2.4.10 %global bundler_connection_pool_version 2.3.0 %global bundler_fileutils_version 1.7.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_tsort_version 0.1.1 -%global bundler_uri_version 0.12.0 +%global bundler_uri_version 0.12.1 %global bigdecimal_version 3.1.3 %global did_you_mean_version 1.6.3 @@ -101,7 +101,7 @@ Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version}%{?development_release} -Release: 179%{?dist} +Release: 180%{?dist} # BSD-3-Clause: missing/{crypt,mt19937,setproctitle}.c # ISC: missing/strl{cat,cpy}.c # Public Domain for example for: include/ruby/st.h, strftime.c, missing/*, ... @@ -1321,12 +1321,12 @@ mv test/ruby/test_jit.rb{,.disable} || : %{gem_dir}/specifications/default/syntax_suggest-1.0.2.gemspec %{gem_dir}/specifications/default/syslog-0.1.1.gemspec %{gem_dir}/specifications/default/tempfile-0.1.3.gemspec -%{gem_dir}/specifications/default/time-0.2.1.gemspec +%{gem_dir}/specifications/default/time-0.2.2.gemspec %{gem_dir}/specifications/default/timeout-0.3.1.gemspec %{gem_dir}/specifications/default/tmpdir-0.1.3.gemspec %{gem_dir}/specifications/default/tsort-0.1.1.gemspec %{gem_dir}/specifications/default/un-0.2.1.gemspec -%{gem_dir}/specifications/default/uri-0.12.0.gemspec +%{gem_dir}/specifications/default/uri-0.12.1.gemspec %{gem_dir}/specifications/default/weakref-0.1.2.gemspec #%%{gem_dir}/specifications/default/win32ole-1.8.9.gemspec %{gem_dir}/specifications/default/yaml-0.2.1.gemspec @@ -1567,6 +1567,10 @@ mv test/ruby/test_jit.rb{,.disable} || : %changelog +* Fri Mar 31 2023 Vít Ondruch - 3.2.2-180 +- Upgrade to Ruby 3.2.2. + Resolves: rhbz#2183284 + * Thu Feb 09 2023 Vít Ondruch - 3.2.1-179 - Upgrade to Ruby 3.2.1. Resolves: rhbz#2168292 diff --git a/sources b/sources index 431c49e..709311a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ruby-3.2.1.tar.xz) = 69caadab9be6b56905ea4fc92fa0e36704f9fa6a0e7e7f4c6bdb79e9cbe8dc57c524f96d9c18802d61aa1ca578fed2e9758692f9d701bf0dba938f0206b721b3 +SHA512 (ruby-3.2.2.tar.xz) = a29f24cd80f563f6368952d06d6273f7241a409fa9ab2f60e03dde2ac58ca06bee1750715b6134caebf4c061d3503446dc37a6059e19860bb0010eef34951935