rpms/mariadb-connector-c
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to 3.1.3

Browse Source
This commit is contained in:
Michal Schorm 2019-08-02 19:04:46 +02:00
parent c4d9f6ff20
commit 1c023f4cea
4 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,3 +13,4 @@
/mariadb-connector-c-3.0.9-src.tar.gz
/mariadb-connector-c-3.0.10-src.tar.gz
/mariadb-connector-c-3.1.2-src.tar.gz
/mariadb-connector-c-3.1.3-src.tar.gz

12
mariadb-connector-c.spec
View File

@ -2,8 +2,8 @@
%bcond_with debug
Name: mariadb-connector-c
Version: 3.1.2
Release: 2%{?with_debug:.debug}%{?dist}
Version: 3.1.3
Release: 1%{?with_debug:.debug}%{?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
@ -12,8 +12,6 @@ Source3: client.cnf
Url: http://mariadb.org/
# More information: https://mariadb.com/kb/en/mariadb/building-connectorc-from-source/
Patch2: pkgconfig.patch
Requires: %{_sysconfdir}/my.cnf
BuildRequires: zlib-devel cmake openssl-devel gcc-c++
# Remote-IO plugin
@ -55,8 +53,6 @@ and require this package, so the /etc/my.cnf file is present.
%prep
%setup -q -n %{name}-%{version}-src
%patch2 -p1
# Remove unsused parts
rm -r win zlib win-iconv examples
@ -204,6 +200,10 @@ popd
# Currently, one of the tests - 'ps_bugs' - is failing
%changelog
* Fri Aug 02 2019 Michal Schorm <mschorm@redhat.com> - 3.1.3-1
- Rebase to 3.1.3 version
- Patch upstreamed
* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 3.1.2-2
- Use macro to set build flags

30
pkgconfig.patch
View File

@ -1,30 +0,0 @@
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@"

2
sources
View File

@ -1 +1 @@
SHA512 (mariadb-connector-c-3.1.2-src.tar.gz) = 8ad0ec5aea07a04e7ac9da6af3d067755dd8f22deed071de2321c581374b5ed1e4d6bab048b231655d3c2a3722b2b99f276d95046c659f867cbd58d772fb17bb
SHA512 (mariadb-connector-c-3.1.3-src.tar.gz) = ca3809a5f1a33317962908ee40d5c339ba6b02c5c8818bf12af9b78eb2289efad711ab74ac7706d711951b22957ba897b5e80b60e8df44924ca70569a4e1c5e7