diff --git a/.gitignore b/.gitignore index 4285ff8..6af972d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /mariadb_client-2.0.0-src.tar.gz /mariadb-connector-c-2.1.0-src.tar.gz /mariadb-connector-c-2.3.1-src.tar.gz +/mariadb-connector-c-2.3.2-src.tar.gz diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index f3acfd2..581e728 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,13 +1,16 @@ Name: mariadb-connector-c -Version: 2.3.1 -Release: 3%{?dist} +Version: 2.3.2 +Release: 1%{?dist} Summary: The MariaDB Native Client library (C driver) Group: Applications/Databases License: LGPLv2+ -Source: http://mirror.hosting90.cz/mariadb//connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz # Later it will probabbly move to http://archive.mariadb.org//connector-c-2.3.1/source-tgz/mariadb-connector-c-2.3.1-src.tar.gz -Url: https://mariadb.org/en/ +Source: http://mirror.hosting90.cz/mariadb/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz +Url: http://mariadb.org/ BuildRequires: zlib-devel cmake openssl-devel +# Patch only for version 2.3.2. The issue on Big endian architectures has been solved by upstream and fixed in all later relases. +Patch1: v2-3-2.patch + %description The MariaDB Native Client library (C driver) is used to connect applications developed in C/C++ to MariaDB and MySQL databases. @@ -25,6 +28,7 @@ Development files for mariadb-connector-c. %prep %setup -q -n mariadb-connector-c-%{version}-src +%patch1 -p1 %build %cmake \ @@ -33,7 +37,7 @@ Development files for mariadb-connector-c. -DWITH_EXTERNAL_ZLIB=ON\ -DPREFIX_INSTALL_DIR="/"\ -DCMAKE_SYSTEM_PROCESSOR="%{_arch}"\ - -DPLUGIN_INSTALL_DIR="%{_libdir}/plugin" # TODO: move plugin dir from libdir/plugin/ to libdir/mariadb/plugin + -DPLUGIN_INSTALL_DIR="%{_libdir}/mariadb/plugin" make %{?_smp_mflags} @@ -61,10 +65,12 @@ rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/cmake_install.cmake %files -%{_libdir}/mariadb/libmariadb.so.2 -%{_libdir}/plugin/dialog.so -%{_libdir}/plugin/mysql_clear_password.so %{_libdir}/mariadb +%{_libdir}/mariadb/libmariadb.so.2 + +%{_libdir}/mariadb/plugin +%{_libdir}/mariadb/plugin/dialog.so +%{_libdir}/mariadb/plugin/mysql_clear_password.so # fix of RPATH. If there is a set config file, libdir/mariadb/ is added to search for libraries %{_sysconfdir}/ld.so.conf.d @@ -81,6 +87,10 @@ rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/cmake_install.cmake %changelog +* Tue Jan 24 2017 Michal Schorm - 2.3.2-1 +- Rebase to versionn 2.3.2, patch needed (fixed by upstream in later versions) +- Plugin dir moved from /libdir/plugin to /libdir/mariadb/plugin + * Thu Oct 27 2016 Michal Schorm - 2.3.1-3 - Fixed ownership of {_libdir}/mariadb (this dir must me owned by package) - Fixed ownership of {_sysconfigdir}/ld.so.conf.d (this dir must me owned by package) diff --git a/sources b/sources index b58b73b..8ccaea9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26a491253bd93a3831cdfc077a83ccc7 mariadb-connector-c-2.3.1-src.tar.gz +SHA512 (mariadb-connector-c-2.3.2-src.tar.gz) = e0055403357b96fe1f14acb238749350e3e3455303d043af6f3ddf0157676b8cf6895964b6c2c21dd8b7c065ffa65a2e574b74257501a5e9e6f6d995624dfc98 diff --git a/v2-3-2.patch b/v2-3-2.patch new file mode 100644 index 0000000..a3b0e4f --- /dev/null +++ b/v2-3-2.patch @@ -0,0 +1,14 @@ +This patch fixes FTBFS problems on big endian architectures (ppc64 and s390x) +This patch is an upstream fix, which will appear in the next version + +--- mariadb-connector-c-2.3.2-src/libmariadb/my_stmt_codec.c 2017-01-17 10:53:54.000000000 +0100 ++++ mariadb-connector-c-2.3.2-src/libmariadb/my_stmt_codec.c_patched 2017-01-23 23:24:00.489702554 +0100 +@@ -358,7 +358,7 @@ static void convert_from_long(MYSQL_BIND + { + float fval; + fval= is_unsigned ? (float)(ulonglong)(val) : (float)val; +- float4store(r_param->buffer, fval); ++ float4store((float *)r_param->buffer, fval); + *r_param->error= is_unsigned ? (ulonglong)fval != (ulonglong)val : (longlong)fval != val; + r_param->buffer_length= 4; + }