diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 65882be..852a970 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}], [ +@@ -3405,6 +3405,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..c6c6e7f 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"], +@@ -4190,7 +4190,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..549bee8 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 +@@ -4254,6 +4254,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..418a38a 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, +@@ -4226,6 +4226,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 +@@ -4250,6 +4254,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 32b3069..a5cca01 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"], +@@ -4140,9 +4140,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, +@@ -4165,57 +4162,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 +@@ -4232,6 +4235,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 081b077..98a81a6 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 d7388f720c +%global revision c5eefb7f37 %global ruby_archive %{name}-%{ruby_version} @@ -48,9 +48,9 @@ %global io_console_version 0.6.0 %global irb_version 1.6.2 %global json_version 2.6.3 -%global openssl_version 3.1.0.pre +%global openssl_version 3.1.0 %global psych_version 5.0.1 -%global racc_version 1.6.1 +%global racc_version 1.6.2 %global rdoc_version 6.5.0 %global stringio_version 3.0.4 @@ -62,14 +62,14 @@ %global rexml_version 3.2.5 %global rss_version 0.2.9 %global net_ftp_version 0.2.0 -%global net_imap_version 0.3.3 +%global net_imap_version 0.3.4 %global net_pop_version 0.1.2 %global net_smtp_version 0.3.3 %global matrix_version 0.4.2 %global prime_version 0.1.2 %global rbs_version 2.8.2 %global typeprof_version 0.21.3 -%global debug_version 1.7.0 +%global debug_version 1.7.1 %global tapset_libdir %(echo %{_libdir} | sed 's/64//')* @@ -1560,8 +1560,8 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/TestGCCompact#test_moving_objects_between_siz %changelog -* Thu Dec 22 2022 Vít Ondruch - 3.2.0-175 -- Upgrade to Ruby 3.2.0 (d7388f720c). +* Fri Dec 23 2022 Vít Ondruch - 3.2.0-175 +- Upgrade to Ruby 3.2.0 (c5eefb7f37). * Thu Dec 08 2022 Vít Ondruch - 3.1.3-173 - Disable MJIT test cases on i686 due to issues with PCH.