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

Upgrade to Ruby 2.3.0 preview2 (r53111).

Browse source
This commit is contained in:
Vít Ondruch 2015-12-14 11:49:44 +01:00
commit a417d6a7ea
8 changed files with 17 additions and 17 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
@@ -1891,7 +1891,7 @@ def configuration(srcdir)
@@ -1892,7 +1892,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
@@ -4319,6 +4319,13 @@ AC_SUBST(rubyarchhdrdir)dnl
@@ -4331,6 +4331,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
@@ -3577,6 +3577,11 @@ if test ${multiarch+set}; then
@@ -3589,6 +3589,11 @@ if test ${multiarch+set}; then
fi
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.in b/configure.in
index db37cd6..ce8d149 100644
--- a/configure.in
+++ b/configure.in
@@ -4173,7 +4173,8 @@ AS_CASE(["$ruby_version_dir_name"],
@@ -4185,7 +4185,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
@@ -4237,6 +4237,8 @@ AC_SUBST(vendorarchdir)dnl
@@ -4249,6 +4249,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
@@ -4209,6 +4209,10 @@ AC_ARG_WITH(vendorarchdir,
@@ -4221,6 +4221,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=''
@@ -4233,6 +4237,7 @@ AC_SUBST(sitearchdir)dnl
@@ -4245,6 +4249,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
@@ -4122,9 +4122,6 @@ AS_CASE(["$target_os"],
@@ -4134,9 +4134,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],
@@ -4147,58 +4144,64 @@ AC_ARG_WITH(ridir,
@@ -4159,58 +4156,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)
@@ -4215,6 +4218,7 @@ AC_SUBST(sitearchincludedir)dnl
@@ -4227,6 +4230,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl

14
ruby.spec
View file

@ -7,7 +7,7 @@
%global ruby_release %{ruby_version}
# Specify the named version. It has precedense to revision.
#%%global milestone preview1
%global milestone preview2
# Keep the revision enabled for pre-releases from SVN.
%global revision 52759
@ -21,7 +21,7 @@
%endif
%global release 6
%global release 7
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
# The RubyGems library has to stay out of Ruby directory three, since the
@ -37,12 +37,12 @@
%global irb_version %{ruby_version}
%global bigdecimal_version 1.2.7
%global did_you_mean_version 1.0.0.beta3
%global did_you_mean_version 1.0.0.rc1
%global io_console_version 0.4.3
%global json_version 1.8.2
%global json_version 1.8.3
%global minitest_version 5.8.3
%global power_assert_version 0.2.6
%global psych_version 2.0.15
%global psych_version 2.0.16
%global rake_version 10.4.2
%global rdoc_version 4.2.0
%global net_telnet_version 0.1.1
@ -929,8 +929,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Thu Dec 10 2015 Vít Ondruch <vondruch@redhat.com> - 2.3.0-0.6.r52759
- Upgrade to Ruby 2.3.0 preview1 (r52759).
* Thu Dec 10 2015 Vít Ondruch <vondruch@redhat.com> - 2.3.0-0.7.preview2
- Upgrade to Ruby 2.3.0 preview2 (r53111).
- Fix ABRT hook autoloading.
- Initialize all load paths in operating_system.rb.
- Fix directory ownership.