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 ef29e16..0465a7f 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 -@@ -4178,7 +4178,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4186,7 +4186,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 5e3fd66..f2b4ea6 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 -@@ -4242,6 +4242,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4250,6 +4250,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 ea9974d..f352da2 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 -@@ -4214,6 +4214,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4222,6 +4222,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='' -@@ -4238,6 +4242,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4246,6 +4250,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 385e700..f36107a 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 -@@ -4128,9 +4128,6 @@ AS_CASE(["$target_os"], +@@ -4136,9 +4136,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], -@@ -4153,57 +4150,63 @@ AC_ARG_WITH(ridir, +@@ -4161,57 +4158,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) -@@ -4220,6 +4223,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4228,6 +4231,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 eca26a5..ae85da3 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 66e5200ba4 +%global revision 0436f1e15a %global ruby_archive %{name}-%{ruby_version} @@ -48,9 +48,9 @@ %global bigdecimal_version 3.1.2 %global did_you_mean_version 1.6.1 -%global erb_version 3.0.0 +%global erb_version 4.0.2 %global io_console_version 0.5.11 -%global irb_version 1.5.0 +%global irb_version 1.5.1 %global json_version 2.6.2 %global openssl_version 3.1.0.pre %global psych_version 5.0.0.dev @@ -71,7 +71,7 @@ %global net_smtp_version 0.3.3 %global matrix_version 0.4.2 %global prime_version 0.1.2 -%global rbs_version 2.7.0 +%global rbs_version 2.8.1 %global typeprof_version 0.21.3 %global debug_version 1.6.3 @@ -972,15 +972,12 @@ MSPECOPTS="" DISABLE_TESTS="$DISABLE_TESTS -n !/TestReadline#test_interrupt_in_other_thread/" %endif -# Test timeouts for some reason. -# https://bugs.ruby-lang.org/issues/19145 -DISABLE_TESTS="$DISABLE_TESTS -n !/TestException#test_exception_in_message/" - %ifarch i686 # i686 specific failures. # https://bugs.ruby-lang.org/issues/19147 DISABLE_TESTS="$DISABLE_TESTS -n !/TestFileExhaustive#test_expand_path_for_existent_username/" DISABLE_TESTS="$DISABLE_TESTS -n !/TestDir#test_home/" +MSPECOPTS="$MSPECOPTS -P 'File.expand_path expands ~ENV..USER..* to.* the user.s home directory'" %endif # Several test broken by libffi-3.4.2. There should be fix in libffi, once @@ -1184,7 +1181,7 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/" %{ruby_libarchdir}/enc/windows_1254.so %{ruby_libarchdir}/enc/windows_1257.so %{ruby_libarchdir}/enc/windows_31j.so -%{ruby_libarchdir}/erb.so +%{ruby_libarchdir}/erb/escape.so %{ruby_libarchdir}/etc.so %{ruby_libarchdir}/fcntl.so %{ruby_libarchdir}/fiddle.so @@ -1250,7 +1247,7 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/" %{gem_dir}/specifications/default/abbrev-0.1.0.gemspec %{gem_dir}/specifications/default/base64-0.1.1.gemspec %{gem_dir}/specifications/default/benchmark-0.2.0.gemspec -%{gem_dir}/specifications/default/cgi-0.3.5.gemspec +%{gem_dir}/specifications/default/cgi-0.3.6.gemspec %{gem_dir}/specifications/default/csv-3.2.2.gemspec %{gem_dir}/specifications/default/date-3.2.3.gemspec %{gem_dir}/specifications/default/delegate-0.2.0.gemspec @@ -1299,7 +1296,7 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/" %{gem_dir}/specifications/default/singleton-0.1.1.gemspec %{gem_dir}/specifications/default/stringio-%{stringio_version}.gemspec %{gem_dir}/specifications/default/strscan-3.0.1.gemspec -%{gem_dir}/specifications/default/syntax_suggest-0.0.1.gemspec +%{gem_dir}/specifications/default/syntax_suggest-1.0.1.gemspec %{gem_dir}/specifications/default/syslog-0.1.0.gemspec %{gem_dir}/specifications/default/tempfile-0.1.2.gemspec %{gem_dir}/specifications/default/time-0.2.0.gemspec @@ -1546,7 +1543,7 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/" %changelog * Thu Nov 24 2022 Vít Ondruch - 3.2.0-1 -- Upgrade to Ruby 3.2.0 (66e5200ba4). +- Upgrade to Ruby 3.2.0 (0436f1e15a). * Tue Nov 22 2022 Vít Ondruch - 3.1.2-171 - Re-disable package notes. It causes additional issues with installing binary