diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 0dcc6ba..a7fe044 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,6 +1,6 @@ Name: mariadb-connector-c Version: 3.0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The MariaDB Native Client library (C driver) License: LGPLv2+ Source: https://downloads.mariadb.org/interstitial/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz @@ -9,6 +9,8 @@ Source3: client.cnf Url: http://mariadb.org/ # More information: https://mariadb.com/kb/en/mariadb/building-connectorc-from-source/ +Patch1: plugindir.patch + Requires: %{_sysconfdir}/my.cnf BuildRequires: zlib-devel cmake openssl-devel gcc-c++ # Remote-IO plugin @@ -48,6 +50,8 @@ and require this package, so the /etc/my.cnf file is present. %prep %setup -q -n mariadb-connector-c-%{version}-src +%patch1 -p1 + # Remove unsused parts rm -r win zlib win-iconv examples @@ -183,6 +187,10 @@ end # https://jira.mariadb.org/browse/CONC-234 %changelog +* Mon Feb 18 2019 Michal Schorm - 3.0.9-2 +- Fix plugindir issues + Resolves: #1624533 + * Mon Feb 18 2019 Michal Schorm - 3.0.9-1 - Rebase to 3.0.9 diff --git a/plugindir.patch b/plugindir.patch new file mode 100644 index 0000000..d5ed3d1 --- /dev/null +++ b/plugindir.patch @@ -0,0 +1,21 @@ +The plugins build system used different path than the mariadb_config, which resulted in plugins that +couldn't be loaded, because they missed "/usr/" at the beginning of their path. + +RH bug: + https://bugzilla.redhat.com/show_bug.cgi?id=1624533 +Upstream Bug: + https://jira.mariadb.org/browse/CONC-383 +Upstream PR: + https://github.com/MariaDB/mariadb-connector-c/pull/105 + +--- mariadb-connector-c-3.0.9-src/include/mariadb_version.h.in 2019-02-08 16:36:35.000000000 +0100 ++++ mariadb-connector-c-3.0.9-src/include/mariadb_version.h.in_patched 2019-03-21 04:11:47.722080986 +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 "@PLUGINDIR@" ++#define MARIADB_PLUGINDIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@" + + /* mysqld compile time options */ + #ifndef MYSQL_CHARSET