From 70bbbb78c260701ed83c9d09a884afccd9d49832 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: May 18 2020 13:11:03 +0000 Subject: Fix FTBFS due to Ruby 2.7, OpenSSL 1.1.1 and CMake 2.8+ incompatibilities. Resolves: rhbz#1800046 --- diff --git a/rubygems.spec b/rubygems.spec index 791f8d2..af91234 100644 --- a/rubygems.spec +++ b/rubygems.spec @@ -33,7 +33,7 @@ Summary: The Ruby standard for packaging ruby libraries Name: rubygems Version: 2.6.13 -Release: 105%{?dist} +Release: 106%{?dist} License: Ruby or MIT URL: https://rubygems.org/ @@ -117,6 +117,15 @@ Documentation for %{name}. %patch0 -p1 +# Fix Ruby 2.7 compatibility. +# https://github.com/rubygems/rubygems/commit/8dc3d5f74af252d3b83678de80232e35c2542156 +sed -i '/hook.inspect/ s|/@(|/[ @](|' lib/rubygems/installer.rb + +# Fixed test fails against OpenSSL 1.1.1. +# https://github.com/rubygems/rubygems/commit/d9ed00405697f05d683b5d27a8417d207048996f +sed -i '/rescue IOError, SocketError, SystemCallError/ s|SystemCallError|SystemCallError, OpenSSL::SSL::SSLError|' \ + lib/rubygems/remote_fetcher.rb + %build # Nothing @@ -186,6 +195,11 @@ export RUBYOPT="--disable-gems -Ilib:test" == '%{molinillo_version}' ] %if %{enable_check} +# Fix compatibility with CMake 2.8+. +# https://github.com/rubygems/rubygems/commit/5d05164c79f5f93e41100e33f5de5f96291b1dd2 +sed -i "/cmake_minimum_required(VERSION 2.6)/a\ + project(self_build NONE)" test/rubygems/test_gem_ext_cmake_builder.rb + ruby -e 'Dir.glob "./test/**/test_*.rb", &method(:require)' # CVE vulnerability check @@ -228,6 +242,10 @@ ruby %{SOURCE12} %changelog +* Thu May 07 2020 Vít Ondruch - 2.6.13-106 +- Fix FTBFS due to Ruby 2.7, OpenSSL 1.1.1 and CMake 2.8+ incompatibilities. + Resolves: rhbz#1800046 + * Thu Jan 30 2020 Fedora Release Engineering - 2.6.13-105 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild