- New upstream version 3.0.5 - 3.0.5 important changes: * CONC-336: Allow multiple initialization of client library * Fixed string to MYSQL_TIME conversion (prepared statements) * CONC-334: Copy all members of MYSQL_FIELD to internal statement structure * Fixed double free in dynamic column library * Added checks for corrupted packets in protocol * MDEV-15450: Added default connection attribute _server_host * CONC-326: fixed wrong openssl thread id callback - 3.0.4 important changes: * Added option MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS for mysql_options()/mysql_optionsv(): * New plugin configuration interface: The default configuration for a specific plugin can be specified via cmake parameter -DCLIENT_PLUGIN_${PLUGIN}=[DYNAMIC|STATIC|OFF]. * Added support for linux abstract socket (MDEV-15655). * CONC-320: Added asynchronous/non-blocking support for OpenSSL and GnuTLS * CONC-294: Access violation in mysql_close when using a connection plugin. * MDEV-14977: If built dynamically the old_password plugin could not be located due to wrong filename (must be mysql_old_password.so instead of old_password.so). * CONC-315: If no default client character set was specified, the utf8 character set will be used by default (instead of setting the client character set to server character set) * CONC-317: Parsing of configuration file fails if key/value pairs contain white spaces. * CONC-322: Correct handling of EAGAIN and EINPROGRESS in OBS-URL: https://build.opensuse.org/request/show/623451 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=30
49 lines
2.2 KiB
Diff
49 lines
2.2 KiB
Diff
Author: Adam Majer <amajer@suse.de>
|
||
Date: Fri Mar 3 15:59:09 CET 2017
|
||
Summary: Remove pure ugliness with paths
|
||
|
||
Index: mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in
|
||
===================================================================
|
||
--- mariadb-connector-c-3.0.5-src.orig/mariadb_config/mariadb_config.c.in
|
||
+++ mariadb-connector-c-3.0.5-src/mariadb_config/mariadb_config.c.in
|
||
@@ -5,13 +5,13 @@
|
||
|
||
static char *mariadb_progname;
|
||
|
||
-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
|
||
-#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
|
||
+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
|
||
+#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb @extra_dynamic_LDFLAGS@"
|
||
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
|
||
#define CFLAGS INCLUDE
|
||
#define VERSION "@MARIADB_CLIENT_VERSION@"
|
||
#define CC_VERSION "@CPACK_PACKAGE_VERSION@"
|
||
-#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@"
|
||
+#define PLUGIN_DIR "@INSTALL_PLUGINDIR@"
|
||
#define SOCKET "@MARIADB_UNIX_ADDR@"
|
||
#define PORT "@MARIADB_PORT@"
|
||
#define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@"
|
||
Index: mariadb-connector-c-3.0.5-src/mariadb_config/libmariadb.pc.in
|
||
===================================================================
|
||
--- mariadb-connector-c-3.0.5-src.orig/mariadb_config/libmariadb.pc.in
|
||
+++ mariadb-connector-c-3.0.5-src/mariadb_config/libmariadb.pc.in
|
||
@@ -6,14 +6,14 @@
|
||
# Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/)
|
||
#
|
||
|
||
-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
|
||
-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
|
||
+includedir=@INCLUDE_INSTALL_DIR@
|
||
+libdir=@INCLUDE_INSTALL_DIR@
|
||
prefix=@PREFIX_INSTALL_DIR@
|
||
|
||
Name: libmariadb
|
||
Version: @LIBMARIADB_VERSION@
|
||
Description: MariaDB Connector/C dynamic library
|
||
-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@
|
||
-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@
|
||
+Cflags: -I@INCLUDE_INSTALL_DIR@ @CMAKE_C_FLAGS@
|
||
+Libs: -L@LIB_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@
|
||
|
||
|