.gitignore

@@ -1,2 +1,2 @@
-SOURCES/mysql2-0.5.4-tests.txz
+SOURCES/mysql2-0.5.3-tests.txz
-SOURCES/mysql2-0.5.4.gem
+SOURCES/mysql2-0.5.3.gem

.rubygem-mysql2.metadata

@@ -1,2 +1,2 @@
-e2eace1373de10f5173bbcabdee9792fa8fe39d0 SOURCES/mysql2-0.5.4-tests.txz
+efae18a40b17065bff7f04732e8165d64393531c SOURCES/mysql2-0.5.3-tests.txz
-22b365253707c1b9735bd5a8abb8be79fb6b3da8 SOURCES/mysql2-0.5.4.gem
+75e6935c4d9a2b1c047d9e9b69c4c6d4c7e0faef SOURCES/mysql2-0.5.3.gem

SPECS/rubygem-mysql2.spec

@@ -5,7 +5,7 @@
 %global gem_name mysql2
 
 Name: rubygem-%{gem_name}
-Version: 0.5.4
+Version: 0.5.3
 Release: 1%{?dist}
 Summary: A simple, fast Mysql library for Ruby, binding to libmysql
 License: MIT
@@ -29,8 +29,8 @@ BuildRequires: rubygem(rspec)
 BuildRequires: %{_bindir}/hostname
 BuildRequires: rubygem(bigdecimal)
 # Used in spec/em/em_spec.rb
-# Comment out to prevent a build error by unsatisfiable dependencies.
+# Comment out to prevent a build error by conflicting requests.
-# No matching package to install: 'rubygem(eventmachine)'
+# Nothing provides libruby.so.2.4()(64bit) needed by rubygem-eventmachine.
 #BuildRequires: rubygem(eventmachine)
 %endif
 
@@ -52,8 +52,13 @@ Documentation for %{name}
 %prep
 %setup -q -n %{gem_name}-%{version} -b 1
 
+
 %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
 
 
@@ -62,9 +67,8 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -pa .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
-mkdir -p %{buildroot}%{gem_extdir_mri}/%{gem_name}
+mkdir -p %{buildroot}%{gem_extdir_mri}
-cp -a .%{gem_extdir_mri}/gem.build_complete %{buildroot}%{gem_extdir_mri}/
+cp -a .%{gem_extdir_mri}/* %{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
@@ -108,14 +112,7 @@ for i in $(seq 10); do
   echo "Waiting connections... ${i}"
 done
 
-# Reset password for the root user due to MariaDB 10.4 authentication change.
+# See https://github.com/brianmario/mysql2/blob/master/.travis_setup.sh
-# 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}" \
@@ -140,6 +137,17 @@ 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
+
 rspec -Ilib:%{buildroot}%{gem_extdir_mri} -f d spec
 popd
 
@@ -164,10 +172,6 @@ kill "$(cat "${MYSQL_TEST_PID_FILE}")"
 
 
 %changelog
-* 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
-
 * 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