1.22 bump

This commit is contained in:
Jitka Plesnikova 2022-04-26 08:59:17 +02:00
parent a5d2c4adca
commit ca4cab4a1b
4 changed files with 7 additions and 20 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/DBD-MariaDB-1.21.tar.gz
/DBD-MariaDB-1.22.tar.gz

View File

@ -1,13 +0,0 @@
diff -up DBD-MariaDB-1.21/t/45bind_no_backslash_escapes.t.orig DBD-MariaDB-1.21/t/45bind_no_backslash_escapes.t
--- DBD-MariaDB-1.21/t/45bind_no_backslash_escapes.t.orig 2022-02-17 14:00:30.765461191 +0100
+++ DBD-MariaDB-1.21/t/45bind_no_backslash_escapes.t 2022-02-17 14:01:54.388057993 +0100
@@ -19,7 +19,8 @@ if ($dbh->{mariadb_serverversion} < 5000
plan skip_all => "Servers < 5.0.1 do not support sql_mode NO_BACKSLASH_ESCAPES";
}
-if ($dbh->{mariadb_clientversion} < 50001) {
+# As from mariadb-connect-c 3.2.x version number for mariadb_clientversion is 3020x
+if ($dbh->{mariadb_clientversion} < 50001 && $dbh->{mariadb_serverversion} < 50001) {
$id2_quoted_no_backslash = q(X'737472696E675C737472696E6722737472696E6727737472696E67');
}

View File

@ -8,8 +8,8 @@
%endif
Name: perl-DBD-MariaDB
Version: 1.21
Release: 16%{?dist}
Version: 1.22
Release: 1%{?dist}
Summary: MariaDB and MySQL driver for the Perl5 Database Interface (DBI)
License: GPL+ or Artistic
URL: https://metacpan.org/release/DBD-MariaDB/
@ -18,9 +18,6 @@ Source1: test-setup.t
Source2: test-clean.t
Source3: test-env.sh
Patch0: DBD-MariaDB-1.21-Run-test-setup-and-clean.patch
# Fix test for changed value of mariadb_clientversion
# mariadb-connector-c 3.2.x version number changed mariadb_clientversion to 3020x
Patch1: DBD-MariaDB-fix-mariadb-connector-c-32x-test.patch
BuildRequires: findutils
BuildRequires: gcc
BuildRequires: make
@ -109,7 +106,6 @@ with "%{_libexecdir}/%{name}/test".
%prep
%setup -q -n DBD-MariaDB-%{version}
%patch0 -p1
%patch1 -p1
cp %{SOURCE1} %{SOURCE2} t/
# Help file to recognise the Perl scripts and normalize shebangs
@ -174,6 +170,9 @@ make test %{?with_perl_DBD_MariaDB_enables_leak_test:EXTENDED_TESTING=1}
%{_libexecdir}/%{name}
%changelog
* Tue Apr 26 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.22-1
- 1.22 bump
* Thu Feb 17 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.21-16
- Fix test for mariadb-connector-c 3.2.x

View File

@ -1 +1 @@
SHA512 (DBD-MariaDB-1.21.tar.gz) = 0378b33e9cd31ced6f2331967c7ea63a233340bb4a60ef2bbece4843b3a62624875aa1a5e61a9fa1b709ecc8d67810c6fa4fb9ccc01df341e6d94325078f360a
SHA512 (DBD-MariaDB-1.22.tar.gz) = f2bd16fa609b94bd5eb538b38b122dec6a4484da062f2cc84fa6ca4a5dfc30e7ff754a00ece22a3a30297c92b4fd3f878ab0e2a581b7082cd1b9a00f33e2b2c7