Compare commits
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4851ffaf10 | ||
|
|
c7a78d5441 |
4 changed files with 24 additions and 11 deletions
|
|
@ -64,18 +64,18 @@ index 79c003e..34f2382 100644
|
||||||
% R = {}
|
% R = {}
|
||||||
% R["ruby_version"] = '"RUBY_LIB_VERSION"'
|
% R["ruby_version"] = '"RUBY_LIB_VERSION"'
|
||||||
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
|
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
|
||||||
index b47b6e1..0b99408 100755
|
index d8987af..1efbd33 100755
|
||||||
--- a/tool/rbinstall.rb
|
--- a/tool/rbinstall.rb
|
||||||
+++ b/tool/rbinstall.rb
|
+++ b/tool/rbinstall.rb
|
||||||
@@ -334,6 +334,7 @@ def CONFIG.[](name, mandatory = false)
|
@@ -338,6 +338,7 @@ if CONFIG["vendordir"]
|
||||||
sitearchlibdir = CONFIG["sitearchdir"]
|
vendorlibdir = CONFIG["vendorlibdir"]
|
||||||
vendorlibdir = CONFIG["vendorlibdir"]
|
vendorarchlibdir = CONFIG["vendorarchdir"]
|
||||||
vendorarchlibdir = CONFIG["vendorarchdir"]
|
end
|
||||||
+rubygemsdir = CONFIG["rubygemsdir"]
|
+rubygemsdir = CONFIG["rubygemsdir"]
|
||||||
mandir = CONFIG["mandir", true]
|
mandir = CONFIG["mandir", true]
|
||||||
docdir = CONFIG["docdir", true]
|
docdir = CONFIG["docdir", true]
|
||||||
enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
|
enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
|
||||||
@@ -560,7 +561,16 @@ def stub
|
@@ -564,7 +565,16 @@ end
|
||||||
install?(:local, :comm, :lib) do
|
install?(:local, :comm, :lib) do
|
||||||
prepare "library scripts", rubylibdir
|
prepare "library scripts", rubylibdir
|
||||||
noinst = %w[*.txt *.rdoc *.gemspec]
|
noinst = %w[*.txt *.rdoc *.gemspec]
|
||||||
|
|
|
||||||
|
|
@ -171,7 +171,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
|
||||||
index d4c110e..d39c9a6 100755
|
index d4c110e..d39c9a6 100755
|
||||||
--- a/tool/rbinstall.rb
|
--- a/tool/rbinstall.rb
|
||||||
+++ b/tool/rbinstall.rb
|
+++ b/tool/rbinstall.rb
|
||||||
@@ -424,7 +424,7 @@ def CONFIG.[](name, mandatory = false)
|
@@ -428,7 +428,7 @@ def CONFIG.[](name, mandatory = false)
|
||||||
|
|
||||||
install?(:doc, :rdoc) do
|
install?(:doc, :rdoc) do
|
||||||
if $rdocdir
|
if $rdocdir
|
||||||
|
|
|
||||||
19
ruby.spec
19
ruby.spec
|
|
@ -1,6 +1,6 @@
|
||||||
%global major_version 2
|
%global major_version 2
|
||||||
%global minor_version 6
|
%global minor_version 6
|
||||||
%global teeny_version 5
|
%global teeny_version 6
|
||||||
%global major_minor_version %{major_version}.%{minor_version}
|
%global major_minor_version %{major_version}.%{minor_version}
|
||||||
|
|
||||||
%global ruby_version %{major_minor_version}.%{teeny_version}
|
%global ruby_version %{major_minor_version}.%{teeny_version}
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%global release 124
|
%global release 125
|
||||||
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
|
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
|
||||||
|
|
||||||
# The RubyGems library has to stay out of Ruby directory tree, since the
|
# The RubyGems library has to stay out of Ruby directory tree, since the
|
||||||
|
|
@ -48,7 +48,7 @@
|
||||||
%global openssl_version 2.1.2
|
%global openssl_version 2.1.2
|
||||||
%global power_assert_version 1.1.3
|
%global power_assert_version 1.1.3
|
||||||
%global psych_version 3.1.0
|
%global psych_version 3.1.0
|
||||||
%global rake_version 12.3.2
|
%global rake_version 12.3.3
|
||||||
%global rdoc_version 6.1.2
|
%global rdoc_version 6.1.2
|
||||||
%global test_unit_version 3.2.9
|
%global test_unit_version 3.2.9
|
||||||
%global xmlrpc_version 0.3.0
|
%global xmlrpc_version 0.3.0
|
||||||
|
|
@ -829,6 +829,14 @@ DISABLE_TESTS="$DISABLE_TESTS -n !/test_segv_\(setproctitle\|test\|loaded_featur
|
||||||
# which fails on Koji.
|
# which fails on Koji.
|
||||||
# https://bugs.ruby-lang.org/issues/14175
|
# https://bugs.ruby-lang.org/issues/14175
|
||||||
sed -i '/def test_mdns_each_address$/,/^ end$/ s/^/#/' test/resolv/test_mdns.rb
|
sed -i '/def test_mdns_each_address$/,/^ end$/ s/^/#/' test/resolv/test_mdns.rb
|
||||||
|
# Disable Timeouting test_queue_with_trap
|
||||||
|
# https://github.com/ruby/ruby/pull/3101/
|
||||||
|
sed -i '/^ def test_queue_with_trap$/,/^ end$/ s/^/#/g' \
|
||||||
|
test/ruby/test_thread_queue.rb
|
||||||
|
# Disable "File.utime allows Time instances in the far future to set
|
||||||
|
# mtime and atime".
|
||||||
|
# https://bugs.ruby-lang.org/issues/16410
|
||||||
|
MSPECOPTS="$MSPECOPTS -P 'File.utime allows Time instances in the far future to set mtime and atime'"
|
||||||
|
|
||||||
make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
|
make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
|
||||||
|
|
||||||
|
|
@ -1175,6 +1183,11 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
|
||||||
%{_mandir}/man5/gemfile.5*
|
%{_mandir}/man5/gemfile.5*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 07 2020 Pavel Valena <pvalena@redhat.com> - 2.6.6-125
|
||||||
|
- Upgrade to Ruby 2.6.6.
|
||||||
|
Resolves: rhbz#1833293
|
||||||
|
Resolves: rhbz#1827505
|
||||||
|
|
||||||
* Tue Oct 08 2019 Slava Kardakov <ojab@ojab.ru> - 2.6.5-124
|
* Tue Oct 08 2019 Slava Kardakov <ojab@ojab.ru> - 2.6.5-124
|
||||||
- Update to Ruby 2.6.5.
|
- Update to Ruby 2.6.5.
|
||||||
|
|
||||||
|
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (ruby-2.6.5.tar.xz) = e8ae3b5d4d23a93d0ef6057235ad0e573665a8b4b6544e1c70b4cce9c4d2fb9094e5c8fe8a9ab7b9996efe3ada603f9b4ef1fd08fb5a83253c1ae2b5e3f202db
|
SHA512 (ruby-2.6.6.tar.xz) = 86caf93dbf61d03781767ab5375a7edf4761f13ba08ccfefe16c0a7550499237e7390c2f72a95d42670d4fe76b2401b4218936187c62ec1572799e9e04c50d62
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue