From b5e456f1212391dd6e011035e0fd372af7609b21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 6 Dec 2022 16:52:08 +0100 Subject: [PATCH] Upgrade to Ruby 3.2.0-rc1. --- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-paths-when-empty-version-string-i.patch | 2 +- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 4 +- ruby-2.3.0-ruby_version.patch | 6 +- ruby.spec | 78 +++++++++---------- 6 files changed, 47 insertions(+), 47 deletions(-) diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 76695a6..2771d9b 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 -@@ -3401,6 +3401,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3404,6 +3404,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 2fae783..fe68a98 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 -@@ -4186,7 +4186,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4189,7 +4189,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 2d65316..0d33019 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 -@@ -4250,6 +4250,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4253,6 +4253,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 b0b61dc..432cf72 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 -@@ -4222,6 +4222,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4225,6 +4225,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='' -@@ -4246,6 +4250,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4249,6 +4253,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 b6963a2..931357d 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 -@@ -4136,9 +4136,6 @@ AS_CASE(["$target_os"], +@@ -4139,9 +4139,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], -@@ -4161,57 +4158,63 @@ AC_ARG_WITH(ridir, +@@ -4164,57 +4161,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) -@@ -4228,6 +4231,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4231,6 +4234,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 3fb1405..3d500af 100644 --- a/ruby.spec +++ b/ruby.spec @@ -7,10 +7,10 @@ %global ruby_release %{ruby_version} # Specify the named version. It has precedense to revision. -#%%global milestone rc1 +%global milestone rc1 # Keep the revision enabled for pre-releases from GIT. -%global revision 0436f1e15a +#%%global revision 0436f1e15a %global ruby_archive %{name}-%{ruby_version} @@ -43,16 +43,16 @@ %global bundler_tsort_version 0.1.1 %global bundler_uri_version 0.10.1 -%global bigdecimal_version 3.1.2 -%global did_you_mean_version 1.6.1 +%global bigdecimal_version 3.1.3 +%global did_you_mean_version 1.6.2 %global erb_version 4.0.2 %global io_console_version 0.5.11 %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 -%global racc_version 1.6.0 -%global rdoc_version 6.4.0 +%global psych_version 5.0.0 +%global racc_version 1.6.1 +%global rdoc_version 6.5.0 %global stringio_version 3.0.3 # Bundled gems. @@ -70,7 +70,7 @@ %global prime_version 0.1.2 %global rbs_version 2.8.1 %global typeprof_version 0.21.3 -%global debug_version 1.6.3 +%global debug_version 1.7.0 %global tapset_libdir %(echo %{_libdir} | sed 's/64//')* @@ -1243,51 +1243,51 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/" %files default-gems %{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/benchmark-0.2.1.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 +%{gem_dir}/specifications/default/date-3.3.0.gemspec +%{gem_dir}/specifications/default/delegate-0.3.0.gemspec %{gem_dir}/specifications/default/did_you_mean-%{did_you_mean_version}.gemspec -%{gem_dir}/specifications/default/digest-3.1.0.gemspec -%{gem_dir}/specifications/default/drb-2.1.0.gemspec +%{gem_dir}/specifications/default/digest-3.1.1.gemspec +%{gem_dir}/specifications/default/drb-2.1.1.gemspec %{gem_dir}/specifications/default/english-0.7.1.gemspec %{gem_dir}/specifications/default/erb-%{erb_version}.gemspec %{gem_dir}/specifications/default/error_highlight-0.5.1.gemspec -%{gem_dir}/specifications/default/etc-1.4.0.gemspec -%{gem_dir}/specifications/default/fcntl-1.0.1.gemspec +%{gem_dir}/specifications/default/etc-1.4.1.gemspec +%{gem_dir}/specifications/default/fcntl-1.0.2.gemspec %{gem_dir}/specifications/default/fiddle-1.1.1.gemspec -%{gem_dir}/specifications/default/fileutils-1.6.0.gemspec +%{gem_dir}/specifications/default/fileutils-1.7.0.gemspec %{gem_dir}/specifications/default/find-0.1.1.gemspec -%{gem_dir}/specifications/default/forwardable-1.3.2.gemspec -%{gem_dir}/specifications/default/getoptlong-0.1.1.gemspec -%{gem_dir}/specifications/default/io-nonblock-0.1.1.gemspec +%{gem_dir}/specifications/default/forwardable-1.3.3.gemspec +%{gem_dir}/specifications/default/getoptlong-0.2.0.gemspec +%{gem_dir}/specifications/default/io-nonblock-0.2.0.gemspec %{gem_dir}/specifications/default/io-wait-0.3.0.pre.gemspec -%{gem_dir}/specifications/default/ipaddr-1.2.4.gemspec -%{gem_dir}/specifications/default/logger-1.5.1.gemspec -%{gem_dir}/specifications/default/mutex_m-0.1.1.gemspec -%{gem_dir}/specifications/default/net-http-0.3.0.gemspec -%{gem_dir}/specifications/default/net-protocol-0.1.3.gemspec -%{gem_dir}/specifications/default/nkf-0.1.1.gemspec +%{gem_dir}/specifications/default/ipaddr-1.2.5.gemspec +%{gem_dir}/specifications/default/logger-1.5.2.gemspec +%{gem_dir}/specifications/default/mutex_m-0.1.2.gemspec +%{gem_dir}/specifications/default/net-http-0.3.1.gemspec +%{gem_dir}/specifications/default/net-protocol-0.2.0.gemspec +%{gem_dir}/specifications/default/nkf-0.1.2.gemspec %{gem_dir}/specifications/default/observer-0.1.1.gemspec %{gem_dir}/specifications/default/open3-0.1.1.gemspec -%{gem_dir}/specifications/default/open-uri-0.2.0.gemspec -%{gem_dir}/specifications/default/optparse-0.2.0.gemspec +%{gem_dir}/specifications/default/open-uri-0.3.0.gemspec +%{gem_dir}/specifications/default/optparse-0.3.0.gemspec %{gem_dir}/specifications/default/openssl-%{openssl_version}.gemspec %{gem_dir}/specifications/default/ostruct-0.5.5.gemspec -%{gem_dir}/specifications/default/pathname-0.2.0.gemspec -%{gem_dir}/specifications/default/pp-0.3.0.gemspec +%{gem_dir}/specifications/default/pathname-0.2.1.gemspec +%{gem_dir}/specifications/default/pp-0.4.0.gemspec %{gem_dir}/specifications/default/prettyprint-0.1.1.gemspec -%{gem_dir}/specifications/default/pstore-0.1.1.gemspec +%{gem_dir}/specifications/default/pstore-0.1.2.gemspec %{gem_dir}/specifications/default/racc-%{racc_version}.gemspec %{gem_dir}/specifications/default/readline-0.0.3.gemspec %{gem_dir}/specifications/default/readline-ext-0.1.4.gemspec %{gem_dir}/specifications/default/reline-0.3.1.gemspec -%{gem_dir}/specifications/default/resolv-0.2.1.gemspec +%{gem_dir}/specifications/default/resolv-0.2.2.gemspec %{gem_dir}/specifications/default/resolv-replace-0.1.0.gemspec %{gem_dir}/specifications/default/rinda-0.1.1.gemspec %{gem_dir}/specifications/default/ruby2_keywords-0.0.5.gemspec -%{gem_dir}/specifications/default/securerandom-0.2.0.gemspec +%{gem_dir}/specifications/default/securerandom-0.2.1.gemspec %{gem_dir}/specifications/default/set-1.0.3.gemspec %{gem_dir}/specifications/default/shellwords-0.1.0.gemspec %{gem_dir}/specifications/default/singleton-0.1.1.gemspec @@ -1297,15 +1297,15 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/" %{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 -%{gem_dir}/specifications/default/timeout-0.3.0.gemspec -%{gem_dir}/specifications/default/tmpdir-0.1.2.gemspec -%{gem_dir}/specifications/default/tsort-0.1.0.gemspec -%{gem_dir}/specifications/default/un-0.2.0.gemspec -%{gem_dir}/specifications/default/uri-0.11.0.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/weakref-0.1.1.gemspec #%%{gem_dir}/specifications/default/win32ole-1.8.8.gemspec %{gem_dir}/specifications/default/yaml-0.2.0.gemspec -%{gem_dir}/specifications/default/zlib-2.1.1.gemspec +%{gem_dir}/specifications/default/zlib-3.0.0.gemspec %{gem_dir}/gems/erb-%{erb_version} # Use standalone rubygem-racc if Racc binary is required. Shipping this @@ -1540,7 +1540,7 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/Fiddle::TestFunction#test_argument_count/" %changelog * Thu Nov 24 2022 Vít Ondruch - 3.2.0-173 -- Upgrade to Ruby 3.2.0 (0436f1e15a). +- Upgrade to Ruby 3.2.0-rc1. * Tue Nov 22 2022 Vít Ondruch - 3.1.2-171 - Re-disable package notes. It causes additional issues with installing binary