New upstream release 0.5.4 by merging Fedora rawhide branch (commit: e21b5b9)

Resolves: rhbz#2063773
This commit is contained in:
Jarek Prokop 2022-05-23 19:05:05 +02:00
parent d02ca0175d
commit b9b6db878d
3 changed files with 22 additions and 34 deletions

12
.gitignore vendored
View File

@ -1,10 +1,2 @@
/mysql2-0.3.13.gem
/mysql2-0.3.15.gem
/mysql2-0.3.16.gem
/mysql2-0.4.0.gem
/mysql2-0.4.4.gem
/mysql2-0.4.8.gem
/mysql2-0.4.10.gem
/mysql2-0.5.2.gem
/mysql2-0.5.3-tests.txz
/mysql2-0.5.3.gem
/mysql2-*.gem
/mysql2-*-tests.txz

View File

@ -5,7 +5,7 @@
%global gem_name mysql2
Name: rubygem-%{gem_name}
Version: 0.5.3
Version: 0.5.4
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 conflicting requests.
# Nothing provides libruby.so.2.4()(64bit) needed by rubygem-eventmachine.
# Comment out to prevent a build error by unsatisfiable dependencies.
# No matching package to install: 'rubygem(eventmachine)'
#BuildRequires: rubygem(eventmachine)
%endif
@ -52,13 +52,8 @@ 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
@ -67,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
@ -112,7 +108,14 @@ for i in $(seq 10); do
echo "Waiting connections... ${i}"
done
# See https://github.com/brianmario/mysql2/blob/master/.travis_setup.sh
# 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}" \
@ -137,17 +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
rspec -Ilib:%{buildroot}%{gem_extdir_mri} -f d spec
popd
@ -172,6 +164,10 @@ 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

View File

@ -1,2 +1,2 @@
c6071d911d07ab3779e2348aa43d3c4b mysql2-0.5.3-tests.txz
d54ff014d202c47fe87dc62f7b088411 mysql2-0.5.3.gem
SHA512 (mysql2-0.5.4.gem) = 7852afe449f6931d0dc6ceba542a49280170af56c9f2f1fa369224e1633b6cbd03c1dfeae9d7b2c2c3e0e63fe6dd386b030e0249c9c9de1863476729490c1c9b
SHA512 (mysql2-0.5.4-tests.txz) = edb50d29b17175ce475975630f01b1771c4bc109bf79f33b4af76f8b5db29d86270023f0991f8cec729479cf5cb7ef1319200d248f57ead0a2991033ad333348