From 2d32b04d346cc519cf3d34028fc4abb2b4033a8a Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 17 Oct 2023 09:16:00 +0200 Subject: [PATCH] Remove mysql version constraint --- perl-DBD-MySQL.spec | 10 +++++----- test-setup.t | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/perl-DBD-MySQL.spec b/perl-DBD-MySQL.spec index 5ed75ee..50c5952 100644 --- a/perl-DBD-MySQL.spec +++ b/perl-DBD-MySQL.spec @@ -22,7 +22,7 @@ BuildRequires: findutils BuildRequires: gcc BuildRequires: make # DBD::mysql v5.x requires MySQL 8.x client libraries for building -BuildRequires: %{?fedora:community-}mysql-devel >= 8 +BuildRequires: %{?fedora:community-}mysql-devel BuildRequires: openssl-devel BuildRequires: perl-devel BuildRequires: perl-generators @@ -47,8 +47,8 @@ BuildRequires: perl(DBI) >= 1.609 BuildRequires: perl(DBI::Const::GetInfoType) BuildRequires: perl(DynaLoader) # Tests -BuildRequires: %{?fedora:community-}mysql >= 8 -BuildRequires: %{?fedora:community-}mysql-server >= 8 +BuildRequires: %{?fedora:community-}mysql +BuildRequires: %{?fedora:community-}mysql-server BuildRequires: perl(B) BuildRequires: perl(bigint) # Required to process t/testrules.yml @@ -85,8 +85,8 @@ Summary: Tests for %{name} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: perl-Test-Harness #Requires: hostname -Requires: %{?fedora:community-}mysql >= 8 -Requires: %{?fedora:community-}mysql-server >= 8 +Requires: %{?fedora:community-}mysql +Requires: %{?fedora:community-}mysql-server # Required to process t/testrules.yml Requires: perl(CPAN::Meta::YAML) # Optional tests diff --git a/test-setup.t b/test-setup.t index bf6553c..724c5ea 100755 --- a/test-setup.t +++ b/test-setup.t @@ -26,7 +26,7 @@ system($cmd); is($?, 0); my $attempts = 0; -while (system("/usr/bin/mysqladmin --user=root --socket=$MYSQL_UNIX_PORT ping >/dev/null 2>&1") != 0) { +while (system("/usr/bin/mysqladmin --socket=$MYSQL_UNIX_PORT ping >/dev/null 2>&1") != 0) { sleep 3; $attempts++; if ($attempts > 10) {