Rebase to 3.1.5

Remove plugindir patch. Issue fixed by upstream:
https://jira.mariadb.org/browse/MDEV-20569

.gitignore

@@ -15,3 +15,4 @@
 /mariadb-connector-c-3.1.2-src.tar.gz
 /mariadb-connector-c-3.1.3-src.tar.gz
 /mariadb-connector-c-3.1.4-src.tar.gz
+/mariadb-connector-c-3.1.5-src.tar.gz

mariadb-connector-c.spec

@@ -2,8 +2,8 @@
 %bcond_with     debug
 
 Name:           mariadb-connector-c
-Version:        3.1.4
+Version:        3.1.5
-Release:        2%{?with_debug:.debug}%{?dist}
+Release:        1%{?with_debug:.debug}%{?dist}
 Summary:        The MariaDB Native Client library (C driver)
 License:        LGPLv2+
 Source:         https://downloads.mariadb.org/interstitial/connector-c-%{version}/%{name}-%{version}-src.tar.gz
@@ -13,7 +13,6 @@ Url:            http://mariadb.org/
 # More information: https://mariadb.com/kb/en/mariadb/building-connectorc-from-source/
 
 Patch1:         testsuite.patch
-Patch2:         plugindir.patch
 
 Requires:       %{_sysconfdir}/my.cnf
 BuildRequires:  zlib-devel cmake openssl-devel gcc-c++
@@ -69,7 +68,6 @@ and require this package, so the /etc/my.cnf file is present.
 %prep
 %setup -q -n %{name}-%{version}-src
 %patch1 -p1
-%patch2 -p1
 
 # Remove unsused parts
 rm -r win zlib win-iconv examples
@@ -215,7 +213,6 @@ popd
 #      TODO:        Check atleast the important issues
 
 # Downstream issues:
-#   Start building the ED25519 plugin in CONC/C instead of MariaDB server
 #   Start running this package testsuite at the build time
 #      It requires a running MariaDB server
 #         mariadb-server package pulls in mariadb-connector-c as a dependency
@@ -223,6 +220,9 @@ popd
 #      Need to ensure, that the testsuite will also run properly on 'fedpkg local' buid, not damaging the host machine
 
 %changelog
+* Tue Nov 12 2019 Michal Schorm <mschorm@redhat.com> - 3.1.5-1
+- Rebase to 3.1.5
+
 * Sun Nov 03 2019 Michal Schorm <mschorm@redhat.com> - 3.1.4-2
 - Fix for #1624533
 

plugindir.patch

@@ -1,20 +0,0 @@
-Fix for: "Plugin auth_gssapi_client could not be loaded: /usr//usr/lib64/mariadb/plugin/auth_gssapi_client.so: cannot open shared object file: No such file or directory"
-
-RHBZ: #1768143
-Upstream commit that caused the issue: https://github.com/MariaDB/mariadb-connector-c/commit/11a2d03
-
-It's a Regression of:
-RHBZ: #1624533
-Reproducer: https://jira.mariadb.org/browse/CONC-383
-
---- mariadb-connector-c-3.1.4-src/include/mariadb_version.h.in	2019-09-03 14:48:10.000000000 +0200
-+++ mariadb-connector-c-3.1.4-src/include/mariadb_version.h.in_patched	2019-11-03 12:50:12.453574192 +0100
-@@ -24,7 +24,7 @@
- #define MARIADB_PACKAGE_VERSION_ID @MARIADB_PACKAGE_VERSION_ID@
- #define MARIADB_SYSTEM_TYPE "@CMAKE_SYSTEM_NAME@"
- #define MARIADB_MACHINE_TYPE "@CMAKE_SYSTEM_PROCESSOR@"
--#define MARIADB_PLUGINDIR "@CMAKE_INSTALL_PREFIX@/@PLUGINDIR@"
-+#define MARIADB_PLUGINDIR "@PLUGINDIR@"
- 
- /* mysqld compile time options */
- #ifndef MYSQL_CHARSET

sources

@@ -1 +1 @@
-SHA512 (mariadb-connector-c-3.1.4-src.tar.gz) = 9528760df2aa4921d6a06dfd977977060b58fe7d57c7cb1e323021245533de3da97e45f44818fe9bfdfbe60606aff69f8216e23a0b53620aa21dcdee241c30ea
+SHA512 (mariadb-connector-c-3.1.5-src.tar.gz) = 06da9d400bdaf1db640cd20ef0e028986e7dbe1108c24b73c67d6df40eecc36bcfa35fc0697567a95f5016242da5829a48b47a07c08faf8eadd4ba44b50acc1d