rpms/ruby
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to Ruby 3.3.0-preview2 (e50fcca9a7).

Browse source
This commit is contained in:
Vít Ondruch 2023-09-18 17:06:12 +02:00
commit fec49feda7
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ruby-2.1.0-Enable-configuration-of-archlibdir.patch
View file

@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
index d261ea57b5..3c13076b82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3431,6 +3431,11 @@ AS_IF([test ${multiarch+set}], [
@@ -3434,6 +3434,11 @@ AS_IF([test ${multiarch+set}], [
])
archlibdir='${libdir}/${arch}'

2
ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
View file

@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
index c42436c23d..d261ea57b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4259,7 +4259,8 @@ AS_CASE(["$ruby_version_dir_name"],
@@ -4262,7 +4262,8 @@ AS_CASE(["$ruby_version_dir_name"],
ruby_version_dir=/'${ruby_version_dir_name}'
if test -z "${ruby_version_dir_name}"; then

2
ruby-2.1.0-always-use-i386.patch
View file

@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
index 3c13076b82..93af30321d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4323,6 +4323,8 @@ AC_SUBST(vendorarchdir)dnl
@@ -4326,6 +4326,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

4
ruby-2.1.0-custom-rubygems-location.patch
View file

@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
index 93af30321d..bc13397e0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4295,6 +4295,10 @@ AC_ARG_WITH(vendorarchdir,
@@ -4298,6 +4298,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=''
@@ -4319,6 +4323,7 @@ AC_SUBST(sitearchdir)dnl
@@ -4322,6 +4326,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl

6
ruby-2.3.0-ruby_version.patch
View file

@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
index 80b137e380..63cd3b4f8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4209,9 +4209,6 @@ AS_CASE(["$target_os"],
@@ -4212,9 +4212,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],
@@ -4234,57 +4231,63 @@ AC_ARG_WITH(ridir,
@@ -4237,57 +4234,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)
@@ -4301,6 +4304,7 @@ AC_SUBST(sitearchincludedir)dnl
@@ -4304,6 +4307,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl

2
ruby-3.3.0-Disable-syntax-suggest-test-case.patch
View file

@ -12,7 +12,7 @@ diff --git a/common.mk b/common.mk
index d55d1788aa..73755f6ccd 100644
--- a/common.mk
+++ b/common.mk
@@ -1563,8 +1563,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST)
@@ -1564,8 +1564,6 @@ yes-test-syntax-suggest: $(PREPARE_SYNTAX_SUGGEST)
$(ACTIONS_ENDGROUP)
no-test-syntax-suggest:

12
ruby.spec
View file

@ -7,10 +7,10 @@
%global ruby_release %{ruby_version}
# Specify the named version. It has precedense to revision.
#%%global milestone rc1
%global milestone preview2
# Keep the revision enabled for pre-releases from GIT.
%global revision 7c8932365f
%global revision e50fcca9a7
%global ruby_archive %{name}-%{ruby_version}
@ -46,7 +46,7 @@
%global did_you_mean_version 1.6.3
%global erb_version 4.0.3
%global io_console_version 0.6.0
%global irb_version 1.8.0
%global irb_version 1.8.1
%global json_version 2.6.3
%global openssl_version 3.1.0
%global psych_version 5.1.0
@ -56,7 +56,7 @@
%global syntax_suggest_version 1.1.0
# Bundled gems.
%global minitest_version 5.19.0
%global minitest_version 5.20.0
%global power_assert_version 2.0.3
%global rake_version 13.0.6
%global test_unit_version 3.6.1
@ -1307,7 +1307,7 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
%{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
%{gem_dir}/specifications/default/yarp-0.10.0.gemspec
%{gem_dir}/specifications/default/yarp-0.11.0.gemspec
%{gem_dir}/specifications/default/zlib-3.0.0.gemspec
%{gem_dir}/gems/erb-%{erb_version}
@ -1557,7 +1557,7 @@ make -C %{_vpath_builddir} runruby TESTRUN_SCRIPT=" \
%changelog
* Thu Nov 09 2023 Vít Ondruch <vondruch@redhat.com> - 3.3.0-184
- Upgrade to Ruby 3.3.0 (7c8932365f).
- Upgrade to Ruby 3.3.0-preview2 (e50fcca9a7).
* Thu Nov 09 2023 Jun Aruga <jaruga@redhat.com> - 3.2.2-183
- ssl: use ffdhe2048 from RFC 7919 as the default DH group parameters