- mariadb-connector-c is now a provider of the libmariadb library for mariadb and others - add compatibility symlinks and Provides/Obsoletes - change LIBDIR, INCLUDEDIR and PLUGINDIR paths to be the same as it was in the mariadb package (compatibility reasons) - add baselibs.conf - add %{mariadb_version} macro that should correspond with the current version of the mariadb package - refresh absolute_path_fix.patch and private_library.patch OBS-URL: https://build.opensuse.org/request/show/539318 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=17
49 lines
2.1 KiB
Diff
49 lines
2.1 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.2-src/mariadb_config/mariadb_config.c.in
|
||
===================================================================
|
||
--- mariadb-connector-c-3.0.2-src.orig/mariadb_config/mariadb_config.c.in
|
||
+++ mariadb-connector-c-3.0.2-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 "\
|
||
+#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 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.2-src/mariadb_config/libmariadb.pc.in
|
||
===================================================================
|
||
--- mariadb-connector-c-3.0.2-src.orig/mariadb_config/libmariadb.pc.in
|
||
+++ mariadb-connector-c-3.0.2-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@
|
||
|
||
|