From 03514e2b336899490b02b6b0dfcf402b367a114d Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 9 Mar 2018 15:24:05 +0100 Subject: [PATCH] Merge Fedora master. --- rubygem-mysql2.spec | 4 +++- sources | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rubygem-mysql2.spec b/rubygem-mysql2.spec index 1fa86a7..3417450 100644 --- a/rubygem-mysql2.spec +++ b/rubygem-mysql2.spec @@ -40,7 +40,9 @@ BuildRequires: rubygem(rspec) BuildRequires: %{_bindir}/hostname BuildRequires: rubygem(bigdecimal) # Used in spec/em/em_spec.rb -BuildRequires: rubygem(eventmachine) +# Comment out to prevent a build error by conflicting requests. +# Nothing provides libruby.so.2.4()(64bit) needed by rubygem-eventmachine. +#BuildRequires: rubygem(eventmachine) %endif %description diff --git a/sources b/sources index 1dca6e3..61984de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql2-0.4.10.gem) = 1f9c8eb1b120cfc940b3aa26b2dff54735ccdf54fd6e6745e347179d29803b4a4d1f3b80a86f92dd534089f625ffcd6055458f27aaefebe58f8332890a842b43 +5c8260a0daa0350b5fecbb4ed3c2b4ec mysql2-0.4.10.gem