PR#59: Upgrade to Ruby 2.6.6. - rpms/ruby

rpms / ruby

#59 Upgrade to Ruby 2.6.6.

Merged 3 years ago by pvalena. Opened 3 years ago by pvalena.

rpms/ pvalena/ruby rebase-f31 into f31

Upgrade to Ruby 2.6.6.

Pavel Valena • 3 years ago

c7a78d5

ruby-2.1.0-custom-rubygems-location.patch

file modified

+6 -6

		`@@ -64,18 +64,18 @@`
		`% R = {}`
		`% R["ruby_version"] = '"RUBY_LIB_VERSION"'`
		`diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb`
		`- index b47b6e1..0b99408 100755`
		`+ index d8987af..1efbd33 100755`
		`--- a/tool/rbinstall.rb`
		`+++ b/tool/rbinstall.rb`
		`- @@ -334,6 +334,7 @@ def CONFIG.[](name, mandatory = false)`
		`- sitearchlibdir = CONFIG["sitearchdir"]`
		`- vendorlibdir = CONFIG["vendorlibdir"]`
		`- vendorarchlibdir = CONFIG["vendorarchdir"]`
		`+ @@ -338,6 +338,7 @@ if CONFIG["vendordir"]`
		`+ vendorlibdir = CONFIG["vendorlibdir"]`
		`+ vendorarchlibdir = CONFIG["vendorarchdir"]`
		`+ end`
		`+rubygemsdir = CONFIG["rubygemsdir"]`
		`mandir = CONFIG["mandir", true]`
		`docdir = CONFIG["docdir", true]`
		`enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'`
		`- @@ -560,7 +561,16 @@ def stub`
		`+ @@ -564,7 +565,16 @@ end`
		`install?(:local, :comm, :lib) do`
		`prepare "library scripts", rubylibdir`
		`noinst = %w[.txt .rdoc *.gemspec]`

ruby-2.3.0-ruby_version.patch

file modified

+1 -1

		`@@ -171,7 +171,7 @@`
		`index d4c110e..d39c9a6 100755`
		`--- a/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`
		`if $rdocdir`

ruby.spec

file modified

+12 -3

		`@@ -1,6 +1,6 @@`
		`%global major_version 2`
		`%global minor_version 6`
		`- %global teeny_version 5`
		`+ %global teeny_version 6`
		`%global major_minor_version %{major_version}.%{minor_version}`

		`%global ruby_version %{major_minor_version}.%{teeny_version}`
		`@@ -21,7 +21,7 @@`
		`%endif`


		`- %global release 124`
		`+ %global release 125`
		`%{!?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`
		`@@ -48,7 +48,7 @@`
		`%global openssl_version 2.1.2`
		`%global power_assert_version 1.1.3`
		`%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 test_unit_version 3.2.9`
		`%global xmlrpc_version 0.3.0`
		`@@ -829,6 +829,10 @@`
		`# which fails on Koji.`
		`# https://bugs.ruby-lang.org/issues/14175`
		`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`

		`make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"`

		`@@ -1175,6 +1179,11 @@`
		`%{_mandir}/man5/gemfile.5*`

		`%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`
		`- Update to Ruby 2.6.5.`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (ruby-2.6.5.tar.xz) = e8ae3b5d4d23a93d0ef6057235ad0e573665a8b4b6544e1c70b4cce9c4d2fb9094e5c8fe8a9ab7b9996efe3ada603f9b4ef1fd08fb5a83253c1ae2b5e3f202db`
		`+ SHA512 (ruby-2.6.6.tar.xz) = 86caf93dbf61d03781767ab5375a7edf4761f13ba08ccfefe16c0a7550499237e7390c2f72a95d42670d4fe76b2401b4218936187c62ec1572799e9e04c50d62`

pvalena commented 3 years ago

Resolves: rhbz#1833293
Resolves: rhbz#1827505

I will merge this momentarily, as stable Fedora has it's own update-testing repo.

Scratch/COPR-builds:
https://koji.fedoraproject.org/koji/taskinfo?taskID=44367430
https://copr.fedorainfracloud.org/coprs/pvalena/ruby/build/1379594/

jaruga commented on line 34 of ruby.spec 3 years ago

I feel the regular expression can be a bit simpler and safer, setting the range of the replacement like this.

sed -i '/^  def test_queue_with_trap$/,/^  end$/ s/\(assert_in_out_err(.*\))/\1, **{:timeout => 60})/' \
  test/ruby/test_thread_queue.rb

jaruga commented 3 years ago

Thanks for the PR. Other parts look good to me!

pvalena commented 3 years ago

Well, this seems strange. Now I'm getting "unpackaged files" error, which I've failed to notice previously. It seems it's the whole /usr/share/ruby/rubygems/ folder.

Edited 3 years ago by pvalena

rebased onto 048d805ddf6ae827b9d12fc46bd3e8579c8bcc28

3 years ago

jaruga commented 3 years ago

I was able to reproduce the error on my local mock build.
I do not know why.

%files -n rubygems
%{_bindir}/gem
%dir %{rubygems_dir}
%{rubygems_dir}/rubygems <= This line's behavior is changed?
%{rubygems_dir}/rubygems.rb

https://koji.fedoraproject.org/koji/packageinfo?packageID=125
But I think the clue of the error might be

rpm-build 4.15.0-1.fc31 was used in the last f31 build.
https://koji.fedoraproject.org/koji/packageinfo?packageID=125
This time rpm-build 4.15.1-1.fc31 is used.

rebased onto c7a78d5

3 years ago

pvalena commented 3 years ago

Turns out I was modyfiing the patch unintentionally, fixed, and polished on your suggestion.
Also the test occasionally fails / timeouts anyway, so I've opted for disabling it.

Thanks!

Pull-Request has been merged by pvalena

3 years ago