From fe7908aad89ab2281ec0f8452f394fe73059ad466927d508d715c639af2548cb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 17 Jul 2017 07:10:59 +0000 Subject: [PATCH] Accepting request 510115 from server:database - New upstream version 2.3.3: * Fixed build for big-endian platforms. Obsoletes bigendian_type_fixes.patch * Changed parameter type for parameter reconnect in mysql_optionsv from uint to my_bool - absolute_path_fix.patch: refreshed - Remove unused gnutls from buildrequires OBS-URL: https://build.opensuse.org/request/show/510115 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=4 --- absolute_path_fix.patch | 16 +++++++------- bigendian_type_fixes.patch | 25 ---------------------- mariadb-connector-c-2.3.2-src.tar.gz | 3 --- mariadb-connector-c-2.3.2-src.tar.gz.asc | 11 ---------- mariadb-connector-c-2.3.3-src.tar.gz | 3 +++ mariadb-connector-c-2.3.3-src.tar.gz.asc | 11 ++++++++++ mariadb-connector-c.changes | 15 +++++++++++++ mariadb-connector-c.spec | 27 +++++++++++------------- 8 files changed, 49 insertions(+), 62 deletions(-) delete mode 100644 bigendian_type_fixes.patch delete mode 100644 mariadb-connector-c-2.3.2-src.tar.gz delete mode 100644 mariadb-connector-c-2.3.2-src.tar.gz.asc create mode 100644 mariadb-connector-c-2.3.3-src.tar.gz create mode 100644 mariadb-connector-c-2.3.3-src.tar.gz.asc diff --git a/absolute_path_fix.patch b/absolute_path_fix.patch index 32e0298..940a7e8 100644 --- a/absolute_path_fix.patch +++ b/absolute_path_fix.patch @@ -2,13 +2,13 @@ Author: Adam Majer Date: Fri Mar 3 15:59:09 CET 2017 Summary: Remove pure ugliness with paths -Index: mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in +Index: mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in =================================================================== ---- mariadb-connector-c-2.3.2-src.orig/mariadb_config/mariadb_config.c.in -+++ mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in -@@ -3,12 +3,12 @@ - #include +--- mariadb-connector-c-2.3.3-src.orig/mariadb_config/mariadb_config.c.in ++++ mariadb-connector-c-2.3.3-src/mariadb_config/mariadb_config.c.in +@@ -2,12 +2,12 @@ #include + #include -#define INCLUDE "-I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/mysql" -#define LIBS "-L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb" \ @@ -22,10 +22,10 @@ Index: mariadb-connector-c-2.3.2-src/mariadb_config/mariadb_config.c.in #define SOCKET "@MYSQL_UNIX_ADDR@" #define PORT "@MYSQL_PORT@" -Index: mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt +Index: mariadb-connector-c-2.3.3-src/libmariadb/CMakeLists.txt =================================================================== ---- mariadb-connector-c-2.3.2-src.orig/libmariadb/CMakeLists.txt -+++ mariadb-connector-c-2.3.2-src/libmariadb/CMakeLists.txt +--- mariadb-connector-c-2.3.3-src.orig/libmariadb/CMakeLists.txt ++++ mariadb-connector-c-2.3.3-src/libmariadb/CMakeLists.txt @@ -430,9 +430,9 @@ ENDIF() INSTALL(TARGETS diff --git a/bigendian_type_fixes.patch b/bigendian_type_fixes.patch deleted file mode 100644 index abc9335..0000000 --- a/bigendian_type_fixes.patch +++ /dev/null @@ -1,25 +0,0 @@ -Author: Adam Majer -Date: Fri Mar 3 14:57:53 CET 2017 -Summary: Fix build failure on Big Endien machines - -include/my_global.h:930:31: warning: dereferencing 'void *' pointer [enabled by default] - *((T)+2)=(char) ((uchar *) &A)[1];\ - ^ -libmariadb/my_stmt_codec.c:361:7: note: in expansion of macro 'float4store' - float4store(r_param->buffer, fval); - ^ -libmariadb/my_stmt_codec.c:361:7: error: invalid use of void expression - -Index: mariadb-connector-c-2.3.2-src/libmariadb/my_stmt_codec.c -=================================================================== ---- mariadb-connector-c-2.3.2-src.orig/libmariadb/my_stmt_codec.c -+++ mariadb-connector-c-2.3.2-src/libmariadb/my_stmt_codec.c -@@ -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((uchar *)r_param->buffer, fval); - *r_param->error= is_unsigned ? (ulonglong)fval != (ulonglong)val : (longlong)fval != val; - r_param->buffer_length= 4; - } diff --git a/mariadb-connector-c-2.3.2-src.tar.gz b/mariadb-connector-c-2.3.2-src.tar.gz deleted file mode 100644 index c8c4247..0000000 --- a/mariadb-connector-c-2.3.2-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4063c8655dc37608d4eade981e25b76f67f5d36e8426dc7f20d59e48ebba628a -size 538172 diff --git a/mariadb-connector-c-2.3.2-src.tar.gz.asc b/mariadb-connector-c-2.3.2-src.tar.gz.asc deleted file mode 100644 index 1f813f0..0000000 --- a/mariadb-connector-c-2.3.2-src.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAABCAAGBQJYfrGoAAoJEM4aPdXjyU9J1U0H/0U+qBNVoVTSXh++rWofQ2Mq -aC0qtyRe2eZ9ybuW2qRntDgix8tv8xY9edjMPI8huZqEKKyNCa+KkC2z5vdduRo9 -KpWqzAGuTGrHfiSFFx8uYa7DJMz++rApNsPVclCV5l/KqYpDHnjP1nvjBDAkksj9 -570DhN+lfW4jPb6YU8cZ21k1k6oJTi/tXaxletrXeu8erab2Srf17LbNCXV4fMid -u+LfDfqCJ0XsUobEDnxMYpNGOhv8ZEqQh6mdIbND4alqS8ty5vcvWAJtRXaMjhaA -nOscbaWlWnuy0e0lZXCHd7hZFdSpQNGYfIOJ1uizjhXKYUZo9vE4lNqIE4sWbF4= -=ZhvH ------END PGP SIGNATURE----- diff --git a/mariadb-connector-c-2.3.3-src.tar.gz b/mariadb-connector-c-2.3.3-src.tar.gz new file mode 100644 index 0000000..9d06ae4 --- /dev/null +++ b/mariadb-connector-c-2.3.3-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82a5710134e7654b9cad58964d6a25ed91b3dc1804ff51e8be2def0032914089 +size 537738 diff --git a/mariadb-connector-c-2.3.3-src.tar.gz.asc b/mariadb-connector-c-2.3.3-src.tar.gz.asc new file mode 100644 index 0000000..ed5df00 --- /dev/null +++ b/mariadb-connector-c-2.3.3-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iQEcBAABCAAGBQJZLaBiAAoJEM4aPdXjyU9JdZ8H/iYT1L6PfAsO8bB2DcPG7Ixi +wwymNU2v2CTRIIiWvjlOVC3k3oIrhVdnEKTOKTc9kKc3TKFq8dujzog86qGB5gG1 +A1mXZvoipz5D+PU0h614WecNi2VgDgIZr89ka/6cYUM3TKPBC1De0PQx9vbHntnn +jL4Dzw8PJwPSkt+Ngk9iU5Ft+qS3BCtO2Ws1EGvmGxcW+QBrOUKdFNL+bBtI7oLz +a57VwoTXCBZ4SA7ZFAdrshN515DAriCk1ldvsfQhPqPwsdXOpJwxst7Q6I2bZ8YR +Ltmv3vVuoQdPEmS0SwTjApSt82JiejRS5euTczCnQ9MEf7tOrh3mwOwuUCa6Ql8= +=W0+a +-----END PGP SIGNATURE----- diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index f67aef6..2e07189 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Jul 13 12:15:06 UTC 2017 - adam.majer@suse.de + +- New upstream version 2.3.3: + * Fixed build for big-endian platforms. Obsoletes + bigendian_type_fixes.patch + * Changed parameter type for parameter reconnect in + mysql_optionsv from uint to my_bool +- absolute_path_fix.patch: refreshed + +------------------------------------------------------------------- +Thu Jul 13 12:00:32 UTC 2017 - olaf@aepfle.de + +- Remove unused gnutls from buildrequires + ------------------------------------------------------------------- Mon Apr 3 13:03:12 UTC 2017 - jengelh@inai.de diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index aaaf572..d000129 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,7 +1,7 @@ # # spec file for package mariadb-connector-c # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_with sqlite3 %define sover 2 %define libname libmariadb @@ -24,24 +25,22 @@ %endif Name: mariadb-connector-c -Version: 2.3.2 +Version: 2.3.3 Release: 0 -License: LGPL-2.1+ Summary: MariaDB connector in C -Url: https://github.com/MariaDB/mariadb-connector-c +License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Source: https://downloads.mariadb.com/Connectors/c/connector-c-2.3.2/%{name}-%{version}-src.tar.gz -Source1: https://downloads.mariadb.com/Connectors/c/connector-c-2.3.2/%{name}-%{version}-src.tar.gz.asc +Url: https://github.com/MariaDB/mariadb-connector-c +Source: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz +Source1: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/%{name}-%{version}-src.tar.gz.asc # Imported from keyserver based on keyid @ https://mariadb.com/kb/en/mariadb-enterprise/mariadb-enterprise-installation-guide/ Source2: mariadb.keyring Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch -Patch2: bigendian_type_fixes.patch Patch3: absolute_path_fix.patch Patch4: private_library.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: curl-devel -BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(krb5-gssapi) BuildRequires: pkgconfig(openssl) @@ -55,8 +54,8 @@ MariaDB Connector is used to connect applications developed in C or C++ to MariaDB and MySQL databases. %package -n %{libname}%{sover} -Group: System/Libraries Summary: MariaDB connector in C +Group: System/Libraries %description -n %{libname}%{sover} MariaDB Connector is used to connect applications developed in @@ -65,8 +64,8 @@ C or C++ to MariaDB and MySQL databases. This package holds the runtime components. %package -n %{libname}_plugins -Group: SystemLibraries Summary: Plugins for the MariaDB C Connector +Group: SystemLibraries %description -n %{libname}_plugins MariaDB Connector is used to connect applications developed in @@ -75,8 +74,8 @@ C or C++ to MariaDB and MySQL databases. This package holds MariaDB library plugins. %package -n %{libname}private -Group: System/Libraries Summary: Additional internal libraries for the MariaDB C Connector +Group: System/Libraries %description -n %{libname}private MariaDB Connector is used to connect applications developed in @@ -85,10 +84,10 @@ C or C++ to MariaDB and MySQL databases. This package holds the runtime components with private API. %package -n %{libname}-devel -Group: Development/Libraries/C and C++ Requires: %{libname}%{sover} = %{version} Requires: pkgconfig(openssl) Summary: Development files for the MariaDB Connector C API +Group: Development/Libraries/C and C++ %description -n %{libname}-devel MariaDB Connector is used to connect applications developed in @@ -99,7 +98,6 @@ This package holds the development files. %prep %setup -q -n %{name}-%{version}-src %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -116,8 +114,7 @@ make %{?_smp_mflags} %install %cmake_install -rm %{buildroot}%{_includedir}/mariadb/CMakeLists.txt \ - %{buildroot}%{_includedir}/mariadb/*.am +rm %{buildroot}%{_includedir}/mariadb/CMakeLists.txt rm %{buildroot}%{_libdir}/mariadb/*.a rm %{buildroot}%{_libdir}/*.a