From eae9b5c259facbfb8478de9921ca4f2eb92ec67550fea83411910ed427793301 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Fri, 28 May 2021 07:35:43 +0000
Subject: [PATCH] Accepting request 895835 from
 home:kstreitova:branches:server:database

- set INSTALL_LAYOUT=RPM and adjust libdir, includedir, plugindir
  and pcdir values to fix mariadb_config output. Also fix the
  missing "%s" in private_library.patch so it shows the correct
  path for plugindir [bsc#1179921] [bsc#1183878]

OBS-URL: https://build.opensuse.org/request/show/895835
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=68
---
 mariadb-connector-c.changes |  8 ++++++++
 mariadb-connector-c.spec    |  9 +++++----
 private_library.patch       | 14 +++++++-------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes
index eb94eb5..16882be 100644
--- a/mariadb-connector-c.changes
+++ b/mariadb-connector-c.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu May 27 18:48:59 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
+
+- set INSTALL_LAYOUT=RPM and adjust libdir, includedir, plugindir
+  and pcdir values to fix mariadb_config output. Also fix the
+  missing "%s" in private_library.patch so it shows the correct
+  path for plugindir [bsc#1179921] [bsc#1183878]
+
 -------------------------------------------------------------------
 Thu May 27 09:31:16 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
 
diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec
index a14f3b9..9f2445a 100644
--- a/mariadb-connector-c.spec
+++ b/mariadb-connector-c.spec
@@ -127,12 +127,13 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
   %endif
   -DWITH_EXTERNAL_ZLIB:BOOL=ON \
   -DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \
-  -DINSTALL_LIBDIR:STRING=%{_libdir} \
-  -DINSTALL_INCLUDEDIR:STRING=%{_includedir}/mysql \
-  -DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \
+  -DINSTALL_LAYOUT=RPM \
+  -DINSTALL_LIBDIR:STRING=%{_lib} \
+  -DINSTALL_INCLUDEDIR:STRING=include/mysql \
+  -DINSTALL_PLUGINDIR:STRING=%{_lib}/mysql/plugin/ \
   -DWITH_MYSQLCOMPAT=ON \
   -DWITH_SSL=OPENSSL \
-  -DINSTALL_PCDIR="%{_libdir}/pkgconfig"
+  -DINSTALL_PCDIR="%{_lib}/pkgconfig"
 %make_jobs
 
 %install
diff --git a/private_library.patch b/private_library.patch
index a15cd6c..7b72a22 100644
--- a/private_library.patch
+++ b/private_library.patch
@@ -8,10 +8,10 @@ static linking, create a private shared library that simply
 exports all symbols. With the exception of exported symbols, it is
 identical to the regular library.
 
-Index: mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt
+Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt
 ===================================================================
---- mariadb-connector-c-3.1.11-src.orig/libmariadb/CMakeLists.txt
-+++ mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt
+--- mariadb-connector-c-3.1.13-src.orig/libmariadb/CMakeLists.txt
++++ mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt
 @@ -414,6 +414,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
    SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
  ENDIF()
@@ -50,15 +50,15 @@ Index: mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt
  
  IF(MSVC)
     # On Windows, install PDB
-Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in
+Index: mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in
 ===================================================================
---- mariadb-connector-c-3.1.11-src.orig/mariadb_config/mariadb_config.c.in
-+++ mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in
+--- mariadb-connector-c-3.1.13-src.orig/mariadb_config/mariadb_config.c.in
++++ mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in
 @@ -30,6 +30,7 @@ static char *mariadb_progname;
  #define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql"
  #define LIBS    "-L%s/@INSTALL_LIBDIR@/ -lmariadb"
  #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
-+#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " LIBS_SYS
++#define PRIVATE_LIBS "-L%s/@INSTALL_LIBDIR@ -lmariadbprivate " LIBS_SYS
  #define CFLAGS  INCLUDE
  #define VERSION "@MARIADB_CLIENT_VERSION@"
  #define CC_VERSION "@CPACK_PACKAGE_VERSION@"