rpms/ruby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade to Ruby 2.5.0 (r60018).

Browse Source
This commit is contained in:
Vít Ondruch 2017-10-03 14:14:26 +02:00
parent 4a7bdd7215
commit 726677aab3
9 changed files with 33 additions and 28 deletions
Show Stats 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
@@ -4579,6 +4579,13 @@ AC_SUBST(rubyarchhdrdir)dnl
@@ -4540,6 +4540,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
@@ -3821,6 +3821,11 @@ AS_IF([test ${multiarch+set}], [
@@ -3782,6 +3782,11 @@ AS_IF([test ${multiarch+set}], [
])
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
@@ -4433,7 +4433,8 @@ AS_CASE(["$ruby_version_dir_name"],
@@ -4394,7 +4394,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
@@ -4497,6 +4497,8 @@ AC_SUBST(vendorarchdir)dnl
@@ -4458,6 +4458,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

9
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
@@ -4469,6 +4469,10 @@ AC_ARG_WITH(vendorarchdir,
@@ -4430,6 +4430,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
AS_IF([test "${LOAD_RELATIVE+set}"], [
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_EXEC_PREFIX=''
@@ -4493,6 +4497,7 @@ AC_SUBST(sitearchdir)dnl
@@ -4454,6 +4458,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl
@ -75,16 +75,15 @@ index b47b6e1..0b99408 100755
mandir = CONFIG["mandir", true]
docdir = CONFIG["docdir", true]
configure_args = Shellwords.shellwords(CONFIG["configure_args"])
@@ -531,7 +532,14 @@ def install(src, cmd)
@@ -531,7 +532,13 @@ def install(src, cmd)
install?(:local, :comm, :lib) do
prepare "library scripts", rubylibdir
noinst = %w[README* *.txt *.rdoc *.gemspec]
+ noinst += %w[*ubygems.rb rubygems/ datadir.rb] if rubygemsdir
+ noinst += %w[rubygems.rb rubygems/ datadir.rb] if rubygemsdir
install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode)
+ if rubygemsdir
+ noinst = %w[obsolete.rb]
+ install_recursive(File.join(srcdir, "lib", "rubygems"), File.join(rubygemsdir, "rubygems"), :mode => $data_mode)
+ install(File.join(srcdir, "lib", "ubygems.rb"), File.join(rubygemsdir, "ubygems.rb"), :mode => $data_mode)
+ install(File.join(srcdir, "lib", "rubygems.rb"), File.join(rubygemsdir, "rubygems.rb"), :mode => $data_mode)
+ end
end

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
@@ -935,9 +935,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE)
@@ -946,9 +946,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE)
$(srcdir)/template/prelude.c.tmpl
$(PRELUDE_C): $(COMPILE_PRELUDE) \

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
@@ -4384,9 +4384,6 @@ AS_CASE(["$target_os"],
@@ -4345,9 +4345,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],
@@ -4409,56 +4406,62 @@ AC_ARG_WITH(ridir,
@@ -4370,56 +4367,62 @@ AC_ARG_WITH(ridir,
AC_SUBST(ridir)
AC_SUBST(RI_BASE_NAME)
@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644
AS_IF([test "${LOAD_RELATIVE+set}"], [
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
@@ -4475,6 +4478,7 @@ AC_SUBST(sitearchincludedir)dnl
@@ -4436,6 +4439,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl

2
ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch
View File

@ -25,7 +25,7 @@ index f6c46779e3..cade314748 100755
-}
+env = {}
runner = File.join(abs_archdir, "ruby-runner#{config['EXEEXT']}")
runner = File.join(abs_archdir, "exe/ruby#{config['EXEEXT']}")
runner = nil unless File.exist?(runner)
--
2.14.1

34
ruby.spec
View File

@ -10,7 +10,7 @@
#%%global milestone rc1
# Keep the revision enabled for pre-releases from SVN.
%global revision 59657
%global revision 60018
%global ruby_archive %{name}-%{ruby_version}
@ -29,7 +29,7 @@
%global rubygems_dir %{_datadir}/rubygems
# Bundled libraries versions
%global rubygems_version 2.6.12
%global rubygems_version 2.6.13
%global molinillo_version 0.5.7
# TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM.
@ -37,17 +37,18 @@
%global irb_version %{ruby_version}
%global bigdecimal_version 1.3.2
%global bundler_version 1.15.4
%global did_you_mean_version 1.1.2
%global io_console_version 0.4.6
%global json_version 2.1.0
%global minitest_version 5.10.2
%global minitest_version 5.10.3
%global net_telnet_version 0.1.1
%global openssl_version 2.0.5
%global openssl_version 2.1.0.beta1
%global power_assert_version 1.1.0
%global psych_version 3.0.0.beta3
%global rake_version 12.0.0
%global rdoc_version 5.1.0
%global test_unit_version 3.2.4
%global rake_version 12.1.0
%global rdoc_version 6.0.0.beta2
%global test_unit_version 3.2.5
%global xmlrpc_version 0.3.0
# Might not be needed in the future, if we are lucky enough.
@ -659,6 +660,12 @@ ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_libdir
ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/psych.rb
ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/psych.so %{buildroot}%{ruby_libarchdir}/psych.so
# Remove Bundler until it is really necessary.
rm -rf %{buildroot}%{ruby_libdir}/bundler
rm -rf %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version}
rm -rf %{buildroot}%{gem_dir}/specifications/default/bundler-%{bundler_version}.gemspec
rm %{buildroot}%{_bindir}/bundle*
# Move the binary extensions into proper place (if no gem has binary extension,
# the extensions directory might be empty).
find %{buildroot}%{gem_dir}/extensions/*-%{_target_os}/%{ruby_version}/* -maxdepth 0 \
@ -911,7 +918,6 @@ make check TESTS="-v $DISABLE_TESTS"
%dir %{rubygems_dir}
%{rubygems_dir}/rubygems
%{rubygems_dir}/rubygems.rb
%{rubygems_dir}/ubygems.rb
# Explicitly include only RubyGems directory strucure to avoid accidentally
# packaged content.
@ -930,13 +936,13 @@ make check TESTS="-v $DISABLE_TESTS"
# TODO: Gemify these libraries
%{gem_dir}/specifications/default/cmath-0.0.1.gemspec
%{gem_dir}/specifications/default/csv-0.0.1.gemspec
%{gem_dir}/specifications/default/csv-0.1.0.gemspec
%{gem_dir}/specifications/default/date-0.0.1.gemspec
%{gem_dir}/specifications/default/dbm-0.5.1.gemspec
%{gem_dir}/specifications/default/dbm-1.0.0.beta1.gemspec
%{gem_dir}/specifications/default/digest-0.1.0.gemspec
%{gem_dir}/specifications/default/etc-0.2.1.gemspec
%{gem_dir}/specifications/default/fcntl-0.0.1.gemspec
%{gem_dir}/specifications/default/fiddle-1.0.0.beta1.gemspec
%{gem_dir}/specifications/default/fiddle-1.0.0.beta2.gemspec
%{gem_dir}/specifications/default/fileutils-0.7.2.gemspec
%{gem_dir}/specifications/default/gdbm-2.0.0.beta1.gemspec
%{gem_dir}/specifications/default/ipaddr-1.0.0.gemspec
@ -945,7 +951,7 @@ make check TESTS="-v $DISABLE_TESTS"
%{gem_dir}/specifications/default/stringio-0.0.1.gemspec
%{gem_dir}/specifications/default/strscan-0.0.1.gemspec
%{gem_dir}/specifications/default/webrick-1.4.0.beta1.gemspec
%{gem_dir}/specifications/default/zlib-0.0.1.gemspec
%{gem_dir}/specifications/default/zlib-0.1.0.gemspec
%files -n rubygems-devel
%{_rpmconfigdir}/macros.d/macros.rubygems
@ -1052,8 +1058,8 @@ make check TESTS="-v $DISABLE_TESTS"
%{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec
%changelog
* Tue Apr 11 2017 Vít Ondruch <vondruch@redhat.com> - 2.5.0-0.1.r59657
- Upgrade to Ruby 2.5.0 (r59657).
* Tue Apr 11 2017 Vít Ondruch <vondruch@redhat.com> - 2.5.0-0.1.r60018
- Upgrade to Ruby 2.5.0 (r60018).
- Drop ruby-devel dependency on rubypick, which is pulled in transtitively.
* Mon Apr 03 2017 Vít Ondruch <vondruch@redhat.com> - 2.4.1-79