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

Upgrade to Ruby 2.3.0 preview1 (r52759).

Browse source
This commit is contained in:
Vít Ondruch 2015-11-27 13:58:30 +01:00
commit e3dd260e9b
8 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ruby-1.9.3-mkmf-verbose.patch
View file

@ -11,7 +11,7 @@ diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 682eb46..e6b1445 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1892,7 +1892,7 @@ SRC
@@ -1891,7 +1891,7 @@ def configuration(srcdir)
SHELL = /bin/sh
# V=0 quiet, V=1 verbose. other values don't work.

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
@@ -4268,6 +4268,13 @@ AC_SUBST(rubyarchhdrdir)dnl
@@ -4319,6 +4319,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
@@ -3512,6 +3512,11 @@ if test ${multiarch+set}; then
@@ -3577,6 +3577,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
@@ -4122,7 +4122,8 @@ AS_CASE(["$ruby_version_dir_name"],
@@ -4173,7 +4173,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
@@ -117,7 +117,7 @@ File.foreach "config.status" do |line|
@@ -122,7 +122,7 @@ def config.write(arg)
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
@@ -4186,6 +4186,8 @@ AC_SUBST(vendorarchdir)dnl
@@ -4237,6 +4237,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

8
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
@@ -4158,6 +4158,10 @@ AC_ARG_WITH(vendorarchdir,
@@ -4209,6 +4209,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=''
@@ -4182,6 +4186,7 @@ AC_SUBST(sitearchdir)dnl
@@ -4233,6 +4237,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl
@ -67,7 +67,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index b47b6e1..0b99408 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -328,6 +328,7 @@ sitelibdir = CONFIG["sitelibdir"]
@@ -328,6 +328,7 @@ def CONFIG.[](name, mandatory = false)
sitearchlibdir = CONFIG["sitearchdir"]
vendorlibdir = CONFIG["vendorlibdir"]
vendorarchlibdir = CONFIG["vendorarchdir"]
@ -75,7 +75,7 @@ index b47b6e1..0b99408 100755
mandir = CONFIG["mandir", true]
docdir = CONFIG["docdir", true]
configure_args = Shellwords.shellwords(CONFIG["configure_args"])
@@ -506,7 +507,15 @@ end
@@ -506,7 +507,15 @@ def CONFIG.[](name, mandatory = false)
install?(:local, :comm, :lib) do
prepare "library scripts", rubylibdir
noinst = %w[README* *.txt *.rdoc *.gemspec]

20
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
@@ -4071,9 +4071,6 @@ AS_CASE(["$target_os"],
@@ -4122,9 +4122,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],
@@ -4096,58 +4093,64 @@ AC_ARG_WITH(ridir,
@@ -4147,58 +4144,64 @@ AC_ARG_WITH(ridir,
AC_SUBST(ridir)
AC_SUBST(RI_BASE_NAME)
@ -124,7 +124,7 @@ index db37cd6..6e73fae 100644
if test "${LOAD_RELATIVE+set}"; then
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
@@ -4164,6 +4167,7 @@ AC_SUBST(sitearchincludedir)dnl
@@ -4215,6 +4218,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl
@ -175,7 +175,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index d4c110e..d39c9a6 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -406,7 +406,7 @@ end
@@ -406,7 +406,7 @@ def CONFIG.[](name, mandatory = false)
install?(:doc, :rdoc) do
if $rdocdir
@ -202,7 +202,7 @@ diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
index 55ca080..75eea2b 100644
--- a/lib/rubygems/defaults.rb
+++ b/lib/rubygems/defaults.rb
@@ -31,20 +31,20 @@ module Gem
@@ -31,20 +31,20 @@ def self.default_dir
[
File.dirname(RbConfig::CONFIG['sitedir']),
'Gems',
@ -226,7 +226,7 @@ index 55ca080..75eea2b 100644
]
end
@@ -74,7 +74,8 @@ module Gem
@@ -74,7 +74,8 @@ def self.default_rubygems_dirs
def self.user_dir
parts = [Gem.user_home, '.gem', ruby_engine]
@ -236,7 +236,7 @@ index 55ca080..75eea2b 100644
File.join parts
end
@@ -171,7 +172,7 @@ module Gem
@@ -171,7 +172,7 @@ def self.vendor_dir # :nodoc:
return nil unless RbConfig::CONFIG.key? 'vendordir'
File.join RbConfig::CONFIG['vendordir'], 'gems',
@ -249,7 +249,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 0428bea..b6e090e 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -962,7 +962,8 @@ class TestGem < Gem::TestCase
@@ -962,7 +962,8 @@ def test_self_use_paths
def test_self_user_dir
parts = [@userhome, '.gem', Gem.ruby_engine]
@ -259,7 +259,7 @@ index 0428bea..b6e090e 100644
assert_equal File.join(parts), Gem.user_dir
end
@@ -1089,7 +1090,7 @@ class TestGem < Gem::TestCase
@@ -1089,7 +1090,7 @@ def test_self_user_home_user_drive_and_path
def test_self_vendor_dir
expected =
File.join RbConfig::CONFIG['vendordir'], 'gems',
@ -286,7 +286,7 @@ diff --git a/configure.in b/configure.in
index 6e73fae..c842725 100644
--- a/configure.in
+++ b/configure.in
@@ -270,7 +270,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
@@ -274,7 +274,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)

14
ruby.spec
View file

@ -7,10 +7,10 @@
%global ruby_release %{ruby_version}
# Specify the named version. It has precedense to revision.
%global milestone preview1
#%%global milestone preview1
# Keep the revision enabled for pre-releases from SVN.
%global revision 52539
%global revision 52759
%global ruby_archive %{name}-%{ruby_version}
@ -30,7 +30,7 @@
# Bundled libraries versions
%global rubygems_version 2.5.0
%global molinillo_version 0.3.0
%global molinillo_version 0.4.0
# TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
# http://redmine.ruby-lang.org/issues/5313
@ -40,9 +40,9 @@
%global did_you_mean_version 1.0.0.beta3
%global io_console_version 0.4.3
%global json_version 1.8.2
%global minitest_version 5.8.2
%global minitest_version 5.8.3
%global power_assert_version 0.2.6
%global psych_version 2.0.14
%global psych_version 2.0.15
%global rake_version 10.4.2
%global rdoc_version 4.2.0
%global net_telnet_version 0.1.1
@ -924,8 +924,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Thu Nov 12 2015 Vít Ondruch <vondruch@redhat.com> - 2.3.0-0.6.preview1
- Upgrade to Ruby 2.3.0 preview1 (r52539).
* Thu Nov 26 2015 Vít Ondruch <vondruch@redhat.com> - 2.3.0-0.6.r52759
- Upgrade to Ruby 2.3.0 preview1 (r52759).
- Initialize all load paths in operating_system.rb.
- Fix directory ownership.
- Fix the git BR following the git package split.