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

Upgrade to Ruby 2.3.0 preview1 (r52539).

Browse source
This commit is contained in:
Vít Ondruch 2015-11-12 16:40:34 +01:00
commit d7c22b9071
7 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ diff --git a/common.mk b/common.mk
index 5cfbc3d..3f0a82e 100644
--- a/common.mk
+++ b/common.mk
@@ -122,7 +122,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
@@ -127,7 +127,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
DEFAULT_PRELUDES = $(GEM_PRELUDE)
@ -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
@@ -4268,6 +4268,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
@@ -3504,6 +3504,11 @@ if test ${multiarch+set}; then
@@ -3512,6 +3512,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
@@ -4114,7 +4114,8 @@ AS_CASE(["$ruby_version_dir_name"],
@@ -4122,7 +4122,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
@@ -4186,6 +4186,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,
@@ -4158,6 +4158,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
@@ -4182,6 +4186,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"],
@@ -4071,9 +4071,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,
@@ -4096,58 +4093,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
@@ -4164,6 +4167,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl

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 rc1
%global milestone preview1
# Keep the revision enabled for pre-releases from SVN.
%global revision 52392
%global revision 52539
%global ruby_archive %{name}-%{ruby_version}
@ -21,7 +21,7 @@
%endif
%global release 5
%global release 6
%{!?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,11 +37,11 @@
%global irb_version %{ruby_version}
%global bigdecimal_version 1.2.7
%global did_you_mean_version 1.0.0.beta2
%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 power_assert_version 0.2.4
%global power_assert_version 0.2.6
%global psych_version 2.0.14
%global rake_version 10.4.2
%global rdoc_version 4.2.0
@ -924,8 +924,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Fri Oct 30 2015 Vít Ondruch <vondruch@rehdat.com> - 2.3.0-0.5.r52392
- Upgrade to Ruby 2.3.0 (r52392).
* Thu Nov 12 2015 Vít Ondruch <vondruch@redhat.com> - 2.3.0-0.6.preview1
- Upgrade to Ruby 2.3.0 preview1 (r52539).
- Initialize all load paths in operating_system.rb.
- Fix directory ownership.
- Fix the git BR following the git package split.