Fix overlinking issues

mariadb-connector-c.spec

@@ -1,6 +1,6 @@
 Name:           mariadb-connector-c
 Version:        3.0.10
-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
@@ -10,6 +10,7 @@ Url:            http://mariadb.org/
 # More information: https://mariadb.com/kb/en/mariadb/building-connectorc-from-source/
 
 Patch1:         plugindir.patch
+Patch2:         pkgconfig.patch
 
 Requires:       %{_sysconfdir}/my.cnf
 BuildRequires:  zlib-devel cmake openssl-devel gcc-c++
@@ -53,6 +54,7 @@ and require this package, so the /etc/my.cnf file is present.
 %setup -q -n mariadb-connector-c-%{version}-src
 
 %patch1 -p1
+%patch2 -p1
 
 # Remove unsused parts
 rm -r win zlib win-iconv examples
@@ -177,6 +179,9 @@ popd
 #   https://jira.mariadb.org/browse/CONC-383
 #      DESCRIPTION: Plugin auth_gssapi_client could not be loaded; missing "/usr/" prefix
 #      IN_PROGRESS: Fix from Fedora offered to upstream, waiting for validation; https://github.com/MariaDB/mariadb-connector-c/pull/105
+#   https://jira.mariadb.org/browse/CONC-410
+#      DESCRIPTION: Fix pkgconfig file - overlinking issues
+#      IN_PROGRESS: PR submitted, problem consulted & explained, waiting on upstream response
 
 # Coverity Scan results from 3.0.10 release:
 #   https://jira.mariadb.org/browse/CONC-234
@@ -184,9 +189,6 @@ popd
 #      TODO:        Check atleast the important issues
 
 # Downstream issues:
-#   Packageconfig file cleanup
-#      https://bugzilla.redhat.com/show_bug.cgi?id=1693966
-#      https://src.fedoraproject.org/rpms/mariadb-connector-c/pull-request/8#request_diff
 #   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
@@ -196,6 +198,9 @@ popd
 #      Currently, one of the tests - 'ps_bugs' - is failing
 
 %changelog
+* Tue May 21 2019 Michal Schorm <mschorm@redhat.com> - 3.0.10-2
+- Fix overlinking issues
+
 * Wed May 15 2019 Michal Schorm <mschorm@redhat.com> - 3.0.10-1
 - Rebase to 3.0.10
 - Remove scriplet; no longer needed

pkgconfig.patch

@@ -0,0 +1,30 @@
+Fix overlining issues
+
+https://wiki.openmandriva.org/en/Overlinking_issues_in_packaging
+
+I provided extensive explanation on the upstream:
+https://jira.mariadb.org/browse/CONC-410
+
+--- mariadb-connector-c-3.0.10-src/mariadb_config/libmariadb.pc.in	2019-05-04 07:04:14.000000000 -0400
++++ mariadb-connector-c-3.0.10-src/mariadb_config/libmariadb.pc.in_patched	2019-05-21 08:25:09.825206424 -0400
+@@ -14,6 +14,7 @@ Name: libmariadb
+ Version: @CPACK_PACKAGE_VERSION@
+ Description: MariaDB Connector/C dynamic library
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@
++Libs: -L${libdir} -lmariadb
++Libs.private: @extra_dynamic_LDFLAGS@
+ 
+ 
+--- mariadb-connector-c-3.0.10-src/mariadb_config/mariadb_config.c.in	2019-05-04 07:04:14.000000000 -0400
++++ mariadb-connector-c-3.0.10-src/mariadb_config/mariadb_config.c.in_patched	2019-05-21 08:46:08.473206424 -0400
+@@ -6,7 +6,7 @@
+ 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 LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
+ #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
+ #define CFLAGS  INCLUDE
+ #define VERSION "@MARIADB_CLIENT_VERSION@"
+