From 53f298ce31db967129e9f34d70396dba82125d52 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 8 Feb 2024 22:22:28 -0500 Subject: [PATCH] Avoid rubygem-eventmachine build dependency in RHEL The eventmachine interface is an optional feature, and is otherwise unused in RHEL. This is based on c9s: https://gitlab.com/redhat/centos-stream/rpms/rubygem-mysql2/-/commit/0066899ab0badd4dda4e722019a662a35045bb48 --- rubygem-mysql2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rubygem-mysql2.spec b/rubygem-mysql2.spec index 3f9f7f0..90b93b1 100644 --- a/rubygem-mysql2.spec +++ b/rubygem-mysql2.spec @@ -31,8 +31,11 @@ BuildRequires: rubygem(rspec) # Used in mysql_install_db BuildRequires: %{_bindir}/hostname BuildRequires: rubygem(bigdecimal) -# Used in spec/em/em_spec.rb +%if !0%{?rhel} +# Used in spec/em/em_spec.rb as optional dependency. +# If rubygem-eventmachine is not present, the tests in the file are skipped. BuildRequires: rubygem(eventmachine) +%endif # Used in spec/ssl/gen_certs.sh BuildRequires: %{_bindir}/openssl %endif @@ -193,6 +196,7 @@ kill "$(cat "${MYSQL_TEST_PID_FILE}")" %changelog * Fri Feb 09 2024 Yaakov Selkowitz - 0.5.5-4 - Adapt tests to mariadb 10.11 +- Avoid rubygem-eventmachine build dependency in RHEL * Fri Jan 26 2024 Fedora Release Engineering - 0.5.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild