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

Upgrade to Ruby 2.4.0-preview1 (r55466).

Browse source
This commit is contained in:
Vít Ondruch 2016-06-27 16:16:14 +02:00
commit 4115b7c442
8 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
View file

@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in
index 0e371e2..d4f1dcb 100644
--- a/configure.in
+++ b/configure.in
@@ -4474,6 +4474,13 @@ AC_SUBST(rubyarchhdrdir)dnl
@@ -4495,6 +4495,13 @@ AC_SUBST(rubyarchhdrdir)dnl
AC_SUBST(sitearchhdrdir)dnl
AC_SUBST(vendorarchhdrdir)dnl

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

@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
index 37d9a62..553d4d0 100644
--- a/configure.in
+++ b/configure.in
@@ -3734,6 +3734,11 @@ if test ${multiarch+set}; then
@@ -3755,6 +3755,11 @@ if test ${multiarch+set}; then
fi
archlibdir='${libdir}/${arch}'

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

@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in
index db37cd6..ce8d149 100644
--- a/configure.in
+++ b/configure.in
@@ -4328,7 +4328,8 @@ AS_CASE(["$ruby_version_dir_name"],
@@ -4349,7 +4349,8 @@ AS_CASE(["$ruby_version_dir_name"],
ruby_version_dir=/'${ruby_version_dir_name}'
if test -z "${ruby_version_dir_name}"; then
@ -67,7 +67,7 @@ diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index 07076d4..35e6c3c 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -123,7 +123,7 @@ def config.write(arg)
@@ -113,7 +113,7 @@
val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
case name
when /^prefix$/

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

@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
index 553d4d0..03a4152 100644
--- a/configure.in
+++ b/configure.in
@@ -4392,6 +4392,8 @@ AC_SUBST(vendorarchdir)dnl
@@ -4413,6 +4413,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.in b/configure.in
index 03a4152..0e371e2 100644
--- a/configure.in
+++ b/configure.in
@@ -4364,6 +4364,10 @@ AC_ARG_WITH(vendorarchdir,
@@ -4385,6 +4385,10 @@ AC_ARG_WITH(vendorarchdir,
[vendorarchdir=$withval],
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644
if test "${LOAD_RELATIVE+set}"; then
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_EXEC_PREFIX=''
@@ -4388,6 +4392,7 @@ AC_SUBST(sitearchdir)dnl
@@ -4409,6 +4413,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl

2
ruby-2.2.3-Generate-preludes-using-miniruby.patch
View file

@ -11,7 +11,7 @@ diff --git a/common.mk b/common.mk
index 168dc52..20c218a 100644
--- a/common.mk
+++ b/common.mk
@@ -844,9 +844,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE)
@@ -851,9 +851,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE)
$(PRELUDE_C): $(COMPILE_PRELUDE) \
{$(srcdir)}lib/rubygems/defaults.rb \
{$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \

8
ruby-2.3.0-ruby_version.patch
View file

@ -20,7 +20,7 @@ diff --git a/configure.in b/configure.in
index db37cd6..6e73fae 100644
--- a/configure.in
+++ b/configure.in
@@ -4279,9 +4279,6 @@ AS_CASE(["$target_os"],
@@ -4300,9 +4300,6 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
])
@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
AC_ARG_WITH(rubyarchprefix,
AS_HELP_STRING([--with-rubyarchprefix=DIR],
@@ -4304,56 +4301,62 @@ AC_ARG_WITH(ridir,
@@ -4325,56 +4322,62 @@ AC_ARG_WITH(ridir,
AC_SUBST(ridir)
AC_SUBST(RI_BASE_NAME)
@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644
if test "${LOAD_RELATIVE+set}"; then
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
@@ -4370,6 +4373,7 @@ AC_SUBST(sitearchincludedir)dnl
@@ -4391,6 +4394,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl
@ -282,7 +282,7 @@ diff --git a/configure.in b/configure.in
index 6e73fae..c842725 100644
--- a/configure.in
+++ b/configure.in
@@ -281,7 +281,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
@@ -271,7 +271,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
AC_SUBST(RUBY_BASE_NAME)
AC_SUBST(RUBYW_BASE_NAME)

21
ruby.spec
View file

@ -7,7 +7,7 @@
%global ruby_release %{ruby_version}
# Specify the named version. It has precedense to revision.
#%%global milestone preview2
%global milestone preview1
# Keep the revision enabled for pre-releases from SVN.
%global revision 55184
@ -30,23 +30,23 @@
# Bundled libraries versions
%global rubygems_version 2.6.4
%global molinillo_version 0.4.3
%global molinillo_version 0.5.0
# TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
# http://redmine.ruby-lang.org/issues/5313
%global irb_version %{ruby_version}
%global bigdecimal_version 1.2.8
%global did_you_mean_version 1.0.0
%global did_you_mean_version 1.0.1
%global io_console_version 0.4.6
%global json_version 1.8.3
%global minitest_version 5.8.4
%global power_assert_version 0.2.7
%global minitest_version 5.9.0
%global power_assert_version 0.3.0
%global psych_version 2.0.17
%global rake_version 11.1.2
%global rdoc_version 4.2.1
%global net_telnet_version 0.1.1
%global test_unit_version 3.1.8
%global test_unit_version 3.1.9
%global xmlrpc_version 0.1.1
# Might not be needed in the future, if we are lucky enough.
@ -539,8 +539,8 @@ sed -i 's/Version: \${ruby_version}/Version: %{ruby_version}/' %{buildroot}%{_li
# Kill bundled certificates, as they should be part of ca-certificates.
for cert in \
rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem \
rubygems.org/AddTrustExternalCARoot-2048.pem \
index.rubygems.org/GlobalSignRoot.pem
rubygems.org/AddTrustExternalCARoot.pem \
index.rubygems.org/GlobalSignRootCA.pem
do
rm %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert
rm -r $(dirname %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert)
@ -663,6 +663,7 @@ DISABLE_TESTS="$DISABLE_TESTS -x test_fork.rb"
# https://bugs.ruby-lang.org/issues/12433
DISABLE_TESTS="$DISABLE_TESTS -x test_case_comprehensive.rb"
DISABLE_TESTS="$DISABLE_TESTS -x test_unicode_normalize.rb"
make check TESTS="-v $DISABLE_TESTS"
@ -968,8 +969,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Fri May 27 2016 Vít Ondruch <vondruch@redhat.com> - 2.4.0-0.1.r55184
- Upgrade to Ruby 2.4.0 (r55184).
* Fri May 27 2016 Vít Ondruch <vondruch@redhat.com> - 2.4.0-0.1.preview1
- Upgrade to Ruby 2.4.0-preview1 (r55466).
- Add xmlrpc subpackage.
* Mon May 23 2016 Vít Ondruch <vondruch@redhat.com> - 2.3.1-56