Compare commits

..

No commits in common. "c8-stream-2.6" and "c8-stream-2.7" have entirely different histories.

4 changed files with 16 additions and 33 deletions

3
.gitignore vendored
View File

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

View File

@ -1 +1,2 @@
d6967bc3a34d2dfc683047aee33f8c050ca10722 SOURCES/mysql2-0.5.2.gem efae18a40b17065bff7f04732e8165d64393531c SOURCES/mysql2-0.5.3-tests.txz
75e6935c4d9a2b1c047d9e9b69c4c6d4c7e0faef SOURCES/mysql2-0.5.3.gem

View File

@ -1,15 +0,0 @@
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
index 665147a2..482f1877 100644
--- a/ext/mysql2/client.c
+++ b/ext/mysql2/client.c
@@ -872,8 +872,8 @@ static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
break;
case MYSQL_OPT_LOCAL_INFILE:
- intval = (value == Qfalse ? 0 : 1);
- retval = &intval;
+ boolval = (value == Qfalse ? 0 : 1);
+ retval = &boolval;
break;
case MYSQL_OPT_RECONNECT:

View File

@ -5,18 +5,15 @@
%global gem_name mysql2 %global gem_name mysql2
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: 0.5.2 Version: 0.5.3
Release: 1%{?dist} Release: 1%{?dist}
Summary: A simple, fast Mysql library for Ruby, binding to libmysql Summary: A simple, fast Mysql library for Ruby, binding to libmysql
License: MIT License: MIT
URL: https://github.com/brianmario/mysql2 URL: https://github.com/brianmario/mysql2
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# Fix a client option local_infile not enabled # git clone --no-checkout https://github.com/brianmario/mysql2.git
# with mariadb-connector-c 3.0.2 on big endian environment. # cd mysql2 && git archive -v -o mysql2-0.5.3-tests.txz 0.5.3 spec/
# Temporary patch until mariadb-connector-c version 3.0.3 released. Source1: %{gem_name}-%{version}-tests.txz
# https://github.com/brianmario/mysql2/pull/914
# https://github.com/MariaDB/mariadb-connector-c/commit/434b67e
Patch0: rubygem-mysql2-0.4.10-mariadb-connector-c-3.0.2-fix-wrong-local-infile-on-big-endian.patch
# Required in lib/mysql2.rb # Required in lib/mysql2.rb
Requires: rubygem(bigdecimal) Requires: rubygem(bigdecimal)
@ -53,17 +50,12 @@ BuildArch: noarch
Documentation for %{name} Documentation for %{name}
%prep %prep
gem unpack %{SOURCE0} %setup -q -n %{gem_name}-%{version} -b 1
%setup -q -D -T -n %{gem_name}-%{version}
%patch0 -p1
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%build %build
# Create the gem as gem install only works on a gem file # Create the gem as gem install only works on a gem file
gem build %{gem_name}.gemspec gem build ../%{gem_name}-%{version}.gemspec
# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir # %%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 # by default, so that we can move it into the buildroot in %%install
@ -85,6 +77,8 @@ rm -rf %{buildroot}%{gem_instdir}/ext
%if %{with tests} %if %{with tests}
%check %check
pushd .%{gem_instdir} pushd .%{gem_instdir}
# Move the tests into place
ln -s %{_builddir}/spec spec
TOP_DIR=$(pwd) TOP_DIR=$(pwd)
# Use testing port because the standard mysqld port 3306 is occupied. # Use testing port because the standard mysqld port 3306 is occupied.
@ -175,11 +169,13 @@ kill "$(cat "${MYSQL_TEST_PID_FILE}")"
%doc %{gem_docdir} %doc %{gem_docdir}
%doc %{gem_instdir}/README.md %doc %{gem_instdir}/README.md
%doc %{gem_instdir}/CHANGELOG.md %doc %{gem_instdir}/CHANGELOG.md
%{gem_instdir}/examples
%{gem_instdir}/spec
%changelog %changelog
* 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
* Tue Jun 11 2019 Jun Aruga <jaruga@redhat.com> - 0.5.2-1 * 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) - New upstream release 0.5.2 by merging Fedora master branch (commit: cc15309)
Resolves: rhbz#1672575 Resolves: rhbz#1672575