From 6ff61449edad08efe92168c88437dcd34f71e384 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 2 Jan 2019 14:43:30 +0100 Subject: [PATCH] Rebase to 3.0.8 --- .gitignore | 1 + mariadb-connector-c.spec | 15 +++++---------- sources | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 090f207..a0164c0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /mariadb-connector-c-3.0.5-src.tar.gz /mariadb-connector-c-3.0.6-src.tar.gz /mariadb-connector-c-3.0.7-src.tar.gz +/mariadb-connector-c-3.0.8-src.tar.gz diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 65c32a7..473d9e6 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,5 +1,5 @@ Name: mariadb-connector-c -Version: 3.0.7 +Version: 3.0.8 Release: 1%{?dist} Summary: The MariaDB Native Client library (C driver) License: LGPLv2+ @@ -81,6 +81,7 @@ rm -r win zlib win-iconv examples -DINSTALL_LIBDIR="%{_lib}" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_PLUGINDIR="%{_lib}/mariadb/plugin" \ + -DINSTALL_PCDIR="%{_lib}/pkgconfig" \ \ -DWITH_UNITTEST=ON @@ -108,12 +109,6 @@ ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/my.cnf install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf -%if 0%{?__isa_bits} != 32 -mkdir -p %{buildroot}/%{_libdir}/pkgconfig -mv %{buildroot}/usr/lib/pkgconfig/libmariadb.pc %{buildroot}/%{_libdir}/pkgconfig -rmdir %{buildroot}/usr/lib/pkgconfig -%endif - %check @@ -186,11 +181,11 @@ end # RPMLint issues from 2.3.2 release tracked on the upstream JIRA: # https://jira.mariadb.org/browse/CONC-232 # https://jira.mariadb.org/browse/CONC-234 -# RPMLint issues from 3.0.2 release tracked on the upstream JIRA: -# https://jira.mariadb.org/browse/CONC-287 -# https://jira.mariadb.org/browse/CONC-291 %changelog +* Wed Jan 02 2019 Michal Schorm - 3.0.8-1 +- Rebase to 3.0.8 + * Mon Nov 19 2018 Michal Schorm - 3.0.7-1 - Rebase to 3.0.7 diff --git a/sources b/sources index 4102ef0..7f73d09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mariadb-connector-c-3.0.7-src.tar.gz) = 70facae6234f180d94c0526845a3bf7723d6de3b6871544cb8cea35311fec0537c6342fbf4f024d0dca58ee618642c38748ae73628fcba334064a3c15d307219 +SHA512 (mariadb-connector-c-3.0.8-src.tar.gz) = d9f970c7ac164ef7d8dd748bf2f749cc1f877a9c8f68a1d57e9ff62d95046bb9505619feca1f1d0d1cdefc1ac49489742aadf4ad9e47c8e6a9b8b40c56eed788