4 changed files with 32 additions and 117 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/mysql2-0.5.3-tests.txz
-SOURCES/mysql2-0.5.3.gem
+SOURCES/mysql2-0.5.4-tests.txz
+SOURCES/mysql2-0.5.4.gem
--- a/.rubygem-mysql2.metadata
+++ b/.rubygem-mysql2.metadata
@ -1,2 +1,2 @@
-efae18a40b17065bff7f04732e8165d64393531c SOURCES/mysql2-0.5.3-tests.txz
-75e6935c4d9a2b1c047d9e9b69c4c6d4c7e0faef SOURCES/mysql2-0.5.3.gem
+e2eace1373de10f5173bbcabdee9792fa8fe39d0 SOURCES/mysql2-0.5.4-tests.txz
+22b365253707c1b9735bd5a8abb8be79fb6b3da8 SOURCES/mysql2-0.5.4.gem
--- a/SOURCES/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch
+++ b/SOURCES/rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch
@ -1,22 +0,0 @@
-From cca57b97ad6d1b1b985376be110b89d2b487dea6 Mon Sep 17 00:00:00 2001
-From: Aaron Patterson <tenderlove@ruby-lang.org>
-Date: Tue, 30 Nov 2021 12:59:43 -0800
-Subject: [PATCH] fix assertion on maria
-
-downgrade psych
---
- spec/mysql2/client_spec.rb | 2 +-
-
-diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb
-index 1519e0f5d..41fb834bf 100644
--- a/spec/mysql2/client_spec.rb
-+++ b/spec/mysql2/client_spec.rb
-@@ -573,7 +573,7 @@ def run_gc
-       end
-       expect do
-         @client.query("SELECT SLEEP(1)")
-      end.to raise_error(Mysql2::Error, /Lost connection to MySQL server/)
-+      end.to raise_error(Mysql2::Error, /Lost connection/)
- 
-       if RUBY_PLATFORM !~ /mingw|mswin/
-         expect do
--- a/SPECS/rubygem-mysql2.spec
+++ b/SPECS/rubygem-mysql2.spec
@ -5,8 +5,8 @@
 %global gem_name mysql2

 Name: rubygem-%{gem_name}
-Version: 0.5.3
-Release: 11%{?dist}
+Version: 0.5.4
+Release: 1%{?dist}
 Summary: A simple, fast Mysql library for Ruby, binding to libmysql
 License: MIT
 URL: https://github.com/brianmario/mysql2
@ -14,9 +14,6 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # git clone --no-checkout https://github.com/brianmario/mysql2.git
 # cd mysql2 && git archive -v -o mysql2-0.5.3-tests.txz 0.5.3 spec/
 Source1: %{gem_name}-%{version}-tests.txz
-# Fix test assertion for mariadb-connector-c
-# https://github.com/brianmario/mysql2/commit/cca57b97ad6d1b1b985376be110b89d2b487dea6
-Patch2: rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch

 # Required in lib/mysql2.rb
 Requires: rubygem(bigdecimal)
@ -31,6 +28,10 @@ BuildRequires: rubygem(rspec)
 # Used in mysql_install_db
 BuildRequires: %{_bindir}/hostname
 BuildRequires: rubygem(bigdecimal)
+# Used in spec/em/em_spec.rb
+# Comment out to prevent a build error by unsatisfiable dependencies.
+# No matching package to install: 'rubygem(eventmachine)'
+#BuildRequires: rubygem(eventmachine)
 %endif

 %description
@ -51,16 +52,8 @@ Documentation for %{name}
 %prep
 %setup -q -n %{gem_name}-%{version} -b 1

-pushd %{_builddir}/spec
-%patch2 -p2
-popd
-
 %build
-# Create the gem as gem install only works on a gem file
 gem build ../%{gem_name}-%{version}.gemspec
-
-# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
-# by default, so that we can move it into the buildroot in %%install
 %gem_install


@ -69,8 +62,9 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -pa .%{gem_dir}/* \
        %{buildroot}%{gem_dir}/

-mkdir -p %{buildroot}%{gem_extdir_mri}
-cp -a .%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
+mkdir -p %{buildroot}%{gem_extdir_mri}/%{gem_name}
+cp -a .%{gem_extdir_mri}/gem.build_complete %{buildroot}%{gem_extdir_mri}/
+cp -a .%{gem_extdir_mri}/%{gem_name}/*.so %{buildroot}%{gem_extdir_mri}/%{gem_name}

 # Prevent dangling symlink in -debuginfo.
 rm -rf %{buildroot}%{gem_instdir}/ext
@ -114,8 +108,15 @@ for i in $(seq 10); do
  echo "Waiting connections... ${i}"
 done

-# See https://github.com/brianmario/mysql2/blob/master/.travis_setup.sh
-mysql -u $MYSQL_TEST_USER \
+# Reset password for the root user due to MariaDB 10.4 authentication change.
+# See https://mariadb.com/kb/en/authentication-from-mariadb-104/#altering-the-user-account-to-revert-to-the-previous-authentication-method
+mysql -u ${MYSQL_TEST_USER} \
+  -e "ALTER USER 'root'@'localhost' IDENTIFIED VIA mysql_native_password USING PASSWORD('')" \
+  -S "${MYSQL_TEST_SOCKET}" \
+  -P "${MYSQL_TEST_PORT}"
+
+# See https://github.com/brianmario/mysql2/blob/master/ci/setup.sh
+mysql -u root \
  -e 'CREATE DATABASE /*M!50701 IF NOT EXISTS */ test' \
  -S "${MYSQL_TEST_SOCKET}" \
  -P "${MYSQL_TEST_PORT}"
@ -124,7 +125,7 @@ mysql -u $MYSQL_TEST_USER \
 cat <<EOF > spec/configuration.yml
 root:
  host: localhost
-  username: ${MYSQL_TEST_USER}
+  username: root
  password:
  database: test
  port: ${MYSQL_TEST_PORT}
@ -139,27 +140,6 @@ user:
  socket: ${MYSQL_TEST_SOCKET}
 EOF

-# This test would require changes in host configuration.
-sed -i '/^  it "should be able to connect via SSL options" do$/,/^  end$/ s/^/#/' \
-  spec/mysql2/client_spec.rb
-
-# performance_schema.session_account_connect_attrs is unexpectedly empty.
-# https://github.com/brianmario/mysql2/issues/965
-sed -i '/^  it "should set default program_name in connect_attrs" do$/,/^  end$/ s/^/#/' \
-  spec/mysql2/client_spec.rb
-sed -i '/^  it "should set custom connect_attrs" do$/,/^  end$/ s/^/#/' \
-  spec/mysql2/client_spec.rb
-
-# This test was passing when going through `rescue` branch up to MariaDB 10.4.
-# It fails since MariaDB 10.5.2 instroduced Performance Schema.
-# https://github.com/brianmario/mysql2/issues/1152
-sed -i '/stmt_count/a\\    pending "Does not work with MariaDB"' \
-  spec/mysql2/statement_spec.rb
-
-# Since MariaDB 10.5. the return error message contains mangled input.
-# https://github.com/brianmario/mysql2/issues/1152
-sed -i '/expect(bad_err.message).to include/ s/^/#/' spec/mysql2/error_spec.rb
-
 rspec -Ilib:%{buildroot}%{gem_extdir_mri} -f d spec
 popd

@ -184,60 +164,17 @@ kill "$(cat "${MYSQL_TEST_PID_FILE}")"


 %changelog
-* Thu Feb 17 2022 Pavel Valena <pvalena@redhat.com> - 0.5.3-11
- Fix test assertion for mariadb-connector-c
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.3-10
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Jul 16 2021 Pavel Valena <pvalena@redhat.com> - 0.5.3-9
- Fix FTBFS: remove rubygem-eventmachine dependnecy
-  Resolves: rhbz#1982404
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.3-8
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Feb 11 2021 Vít Ondruch <vondruch@redhat.com> - 0.5.3-7
- Fix FTBFS due to MariaDB 10.5+ incompatibilies.
-  Resolves: rhbz#1914515
-  Resolves: rhbz#1923277
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan  7 03:21:32 CET 2021 Pavel Valena <pvalena@redhat.com> - 0.5.3-6
- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_3.0
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul  2 2020 Alex Chernyakhovsky <achernya@mit.edu> - 0.5.3-4
- Update tests to build and run on F32
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 17 2020 Vít Ondruch <vondruch@redhat.com> - 0.5.3-2
- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.7
-
-* Mon Dec 02 2019 Jun Aruga <jaruga@redhat.com> - 0.5.3-1
- New upstream release 0.5.3
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.5.2-2
- F-30: rebuild against ruby26
+* Mon May 23 2022 Jarek Prokop <jprokop@redhat.com> - 0.5.4-1
+- New upstream release 0.5.4 by merging Fedora rawhide branch (commit: e21b5b9)
+  Resolves: rhbz#2063773

-* Thu Jul 19 2018 Jun Aruga <jaruga@redhat.com> - 0.5.2-1
- New upstream release 0.5.2
+* Fri May 29 2020 Jun Aruga <jaruga@redhat.com> - 0.5.3-1
+- New upstream release 0.5.3 by merging Fedora master branch (commit: 674d475)
+  Resolves: rhbz#1817135

-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Tue Jun 11 2019 Jun Aruga <jaruga@redhat.com> - 0.5.2-1
+- New upstream release 0.5.2 by merging Fedora master branch (commit: cc15309)
+  Resolves: rhbz#1672575

 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild