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 89c8f32..38ea724 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 -Release: 4%{?dist} +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 on big endian environment. -# We still needs this patch. -# 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) @@ -51,17 +48,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 @@ -83,6 +75,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. @@ -173,11 +167,12 @@ 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 +* Mon Dec 02 2019 Jun Aruga - 0.5.3-1 +- New upstream release 0.5.3 + * Fri Jul 26 2019 Fedora Release Engineering - 0.5.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index c296cde..164ec47 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (mysql2-0.5.2.gem) = 6013b0c862f24f0c20b22c50a17390a7a22390e661d0f1afb613177febfbf854f63aea9bc9aa8defc9521896144fbc035a8e16b135abb47384453a23dfd99566 +SHA512 (mysql2-0.5.3-tests.txz) = 2922835f0ad27b5f693cbc920ee239cfe206d2a9f529b43d8e2a700f31f690956adab4c350ce32a40dace5ffb9530d78807a224e33d22aa3a3b6c56a080fd235 +SHA512 (mysql2-0.5.3.gem) = 59a0ee00261b09e8bbfc586a6f75af840a465a94fd8c9463a3d7767e5ea6b7e64507c9571fb90c6d0cdde3cfff560c97fbf3f3c32b3916aca852ef5c41e1bce9