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

Upgrade to Ruby 2.3.0 (r52116).

Browse source
This commit is contained in:
Vít Ondruch 2015-10-13 12:25:13 +02:00
commit 4cabfa5ecd
6 changed files with 15 additions and 11 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
@@ -4260,6 +4260,13 @@ AC_SUBST(rubyarchhdrdir)dnl
@@ -4269,6 +4269,13 @@ AC_SUBST(rubyarchhdrdir)dnl
AC_SUBST(sitearchhdrdir)dnl
AC_SUBST(vendorarchhdrdir)dnl

2
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
@@ -4114,7 +4114,8 @@ AS_CASE(["$ruby_version_dir_name"],
@@ -4123,7 +4123,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.in b/configure.in
index 553d4d0..03a4152 100644
--- a/configure.in
+++ b/configure.in
@@ -4178,6 +4178,8 @@ AC_SUBST(vendorarchdir)dnl
@@ -4187,6 +4187,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
@@ -4150,6 +4150,10 @@ AC_ARG_WITH(vendorarchdir,
@@ -4159,6 +4159,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=''
@@ -4174,6 +4178,7 @@ AC_SUBST(sitearchdir)dnl
@@ -4183,6 +4187,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.in b/configure.in
index db37cd6..6e73fae 100644
--- a/configure.in
+++ b/configure.in
@@ -4063,9 +4063,6 @@ AS_CASE(["$target_os"],
@@ -4072,9 +4072,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],
@@ -4088,58 +4085,64 @@ AC_ARG_WITH(ridir,
@@ -4097,58 +4094,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)
@@ -4156,6 +4159,7 @@ AC_SUBST(sitearchincludedir)dnl
@@ -4165,6 +4168,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl

10
ruby.spec
View file

@ -10,7 +10,7 @@
#%%global milestone rc1
# Keep the revision enabled for pre-releases from SVN.
%global revision 51990
%global revision 52116
%global ruby_archive %{name}-%{ruby_version}
@ -616,6 +616,10 @@ sed -i 's/^/%lang(ja) /' .ruby-doc.ja
%check
DISABLE_TESTS=""
# These tests keeps failing due to
# https://bugzilla.redhat.com/show_bug.cgi?id=1229659
DISABLE_TESTS="-x test_settracefunc.rb $DISABLE_TESTS"
# test_debug(TestRubyOptions) fails due to LoadError reported in debug mode,
# when abrt.rb cannot be required (seems to be easier way then customizing
# the test suite).
@ -917,8 +921,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Tue May 05 2015 Vít Ondruch <vondruch@rehdat.com> - 2.3.0-0.5.r51990
- Upgrade to Ruby 2.3.0 (r51990).
* Tue May 05 2015 Vít Ondruch <vondruch@rehdat.com> - 2.3.0-0.5.r52116
- Upgrade to Ruby 2.3.0 (r52116).
- Initialize all load paths in operating_system.rb.
- Fix directory ownership.
- Fix the git BR following the git package split.