From d02ca0175d85719f15ea6c0354771ace7b39b92b Mon Sep 17 00:00:00 2001
From: Jun Aruga <jaruga@redhat.com>
Date: Fri, 29 May 2020 17:50:35 +0200
Subject: [PATCH] New upstream release 0.5.3 by merging Fedora master branch
 (commit: 674d475)

Resolves: rhbz#1817135
---
 .gitignore                                    |  2 ++
 ...fix-wrong-local-infile-on-big-endian.patch | 15 ----------
 rubygem-mysql2.spec                           | 28 ++++++++-----------
 sources                                       |  3 +-
 4 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 rubygem-mysql2-0.4.10-mariadb-connector-c-3.0.2-fix-wrong-local-infile-on-big-endian.patch

diff --git a/.gitignore b/.gitignore
index 6fc0c8f..83c7da4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /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
diff --git a/rubygem-mysql2-0.4.10-mariadb-connector-c-3.0.2-fix-wrong-local-infile-on-big-endian.patch b/rubygem-mysql2-0.4.10-mariadb-connector-c-3.0.2-fix-wrong-local-infile-on-big-endian.patch
deleted file mode 100644
index ab82224..0000000
--- a/rubygem-mysql2-0.4.10-mariadb-connector-c-3.0.2-fix-wrong-local-infile-on-big-endian.patch
+++ /dev/null
@@ -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:
diff --git a/rubygem-mysql2.spec b/rubygem-mysql2.spec
index 9986248..88cd46c 100644
--- a/rubygem-mysql2.spec
+++ b/rubygem-mysql2.spec
@@ -5,18 +5,15 @@
 %global gem_name mysql2
 
 Name: rubygem-%{gem_name}
-Version: 0.5.2
+Version: 0.5.3
 Release: 1%{?dist}
 Summary: A simple, fast Mysql library for Ruby, binding to libmysql
 License: MIT
 URL: https://github.com/brianmario/mysql2
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-# Fix a client option local_infile not enabled
-# with mariadb-connector-c 3.0.2 on big endian environment.
-# Temporary patch until mariadb-connector-c version 3.0.3 released.
-# 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
+# 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
 
 # Required in lib/mysql2.rb
 Requires: rubygem(bigdecimal)
@@ -53,17 +50,12 @@ BuildArch: noarch
 Documentation for %{name}
 
 %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
 # 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
 # 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}
 %check
 pushd .%{gem_instdir}
+# Move the tests into place
+ln -s %{_builddir}/spec spec
 
 TOP_DIR=$(pwd)
 # 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_instdir}/README.md
 %doc %{gem_instdir}/CHANGELOG.md
-%{gem_instdir}/examples
-%{gem_instdir}/spec
 
 
 %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
 - New upstream release 0.5.2 by merging Fedora master branch (commit: cc15309)
   Resolves: rhbz#1672575
diff --git a/sources b/sources
index 6cbdebe..47b701c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-bbaa27c45b4fdc16669d5a09e8d736c7  mysql2-0.5.2.gem
+c6071d911d07ab3779e2348aa43d3c4b  mysql2-0.5.3-tests.txz
+d54ff014d202c47fe87dc62f7b088411  mysql2-0.5.3.gem