Hello community,
here is the log from the commit of package mysql-connector-cpp for
openSUSE:Factory checked in at 2015-08-17 15:33:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-cpp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes
2014-08-31 09:58:50.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-cpp.new/mysql-connector-cpp.changes
2015-08-17 15:33:28.000000000 +0200
@@ -1,0 +2,16 @@
+Wed Aug 12 14:11:08 UTC 2015 - [email protected]
+
+- Version bump to 1.1.6:
+ * See the news files on
+ https://dev.mysql.com/doc/relnotes/connector-cpp/en/
+- Update soname to libmyslqcppcon7
+- Remove needlessly long description
+- Drop unneeded/merged patches:
+ mysql-connector-cpp-1.1.0-cmake-paths-fix.patch
+ mysql-connector-cpp-1.1.0-gcc44.patch
+- Refresh patch:
+ mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch
+- Add patch to build with mariadb:
+ mariadb_api.patch
+
+-------------------------------------------------------------------
Old:
----
mysql-connector-c++-1.1.2.tar.bz2
mysql-connector-cpp-1.1.0-cmake-paths-fix.patch
mysql-connector-cpp-1.1.0-gcc44.patch
New:
----
mariadb_api.patch
mysql-connector-c++-1.1.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-cpp.spec ++++++
--- /var/tmp/diff_new_pack.1n6XYW/_old 2015-08-17 15:33:28.000000000 +0200
+++ /var/tmp/diff_new_pack.1n6XYW/_new 2015-08-17 15:33:28.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mysql-connector-cpp
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -16,20 +16,17 @@
#
+%define libname libmysqlcppconn7
Name: mysql-connector-cpp
-Version: 1.1.2
+Version: 1.1.6
Release: 0
Summary: MySQL Connector/C++: Standardized database driver for C++
development
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/C and C++
Url: http://dev.mysql.com/downloads/connector/
-#
http://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-%%{version}.tar.gz
-Source: mysql-connector-c++-%{version}.tar.bz2
-# PATCH-SUSE-INTEGRATION -
mysql-connector-cpp-1.0.4-beta-cmake-paths-fix.patch [] [email protected] --
adjust some default paths
-Patch0: mysql-connector-cpp-1.1.0-cmake-paths-fix.patch
-# PATCH-UPSTREAM-FIX - mysql-connector-cpp-1.0.4-beta-gcc44.patch [
upstream#44931 ] [email protected] -- adding missing includes
-# http://bugs.mysql.com/44931
-Patch1: mysql-connector-cpp-1.1.0-gcc44.patch
+Source:
http://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM: work with mariadb versions properly too
+Patch0: mariadb_api.patch
# PATCH-FEATURE-OPENSUSE -
mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch [email protected] --
disable building tests and examples
Patch2: mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch
BuildRequires: boost-devel >= 1.34.0
@@ -49,19 +46,10 @@
full functionality is not available when connecting to MySQL 5.0. You cannot
connect to MySQL 4.1 or earlier.
-Using MySQL Connector/C++ instead of the MySQL C API (MySQL Client Library)
-offers the following advantages for C++ users:
-
- * Convenience of pure C++ - no C function calls
- * Support of a well designed API - JDBC 4.0
- * Support of a commonly known and well documented API - JDBC 4.0
- * Support of the object oriented programming paradigma
- * Shorter development times
-
%package -n libmysqlcppconn-devel
Summary: Development files for MySQL Connector/C++
Group: Development/Libraries/C and C++
-Requires: libmysqlcppconn6 = %{version}
+Requires: %{libname} = %{version}
Obsoletes: mysql-connector-c++-devel < %{version}
Provides: mysql-connector-c++-devel = %{version}
@@ -74,20 +62,11 @@
full functionality is not available when connecting to MySQL 5.0. You cannot
connect to MySQL 4.1 or earlier.
-Using MySQL Connector/C++ instead of the MySQL C API (MySQL Client Library)
-offers the following advantages for C++ users:
-
- * Convenience of pure C++ - no C function calls
- * Support of a well designed API - JDBC 4.0
- * Support of a commonly known and well documented API - JDBC 4.0
- * Support of the object oriented programming paradigma
- * Shorter development times
-
-%package -n libmysqlcppconn6
+%package -n %{libname}
Summary: MySQL Connector/C++: Standardized database driver for C++
development
Group: Development/Libraries/C and C++
-%description -n libmysqlcppconn6
+%description -n %{libname}
MySQL Connector/C++ is a MySQL database connector for C++ development. The
MySQL driver for C++ can be used to connect to MySQL from C++ applications. The
driver mimics the JDBC 4.0 API. It implements a significant subset of JDBC 4.0.
@@ -96,19 +75,9 @@
full functionality is not available when connecting to MySQL 5.0. You cannot
connect to MySQL 4.1 or earlier.
-Using MySQL Connector/C++ instead of the MySQL C API (MySQL Client Library)
-offers the following advantages for C++ users:
-
- * Convenience of pure C++ - no C function calls
- * Support of a well designed API - JDBC 4.0
- * Support of a commonly known and well documented API - JDBC 4.0
- * Support of the object oriented programming paradigma
- * Shorter development times
-
%prep
%setup -q -n mysql-connector-c++-%{version}
%patch0 -p1
-%patch1
%patch2 -p1
chmod -x examples/*
@@ -118,7 +87,8 @@
-DMYSQLCPPCONN_ICU_ENABLE=OFF \
-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
-DCMAKE_INSTALL_LIB_DIR=%{_lib} \
- -DMYSQLCLIENT_STATIC_BINDING=0
+ -DMYSQLCLIENT_STATIC_BINDING=0 \
+ -DMYSQL_CXX_LINKAGE=0
make %{?_smp_mflags} VERBOSE=1
%install
@@ -126,9 +96,9 @@
rm -f %{buildroot}%{_libdir}/libmysqlcppconn-static.a
rm -f %{buildroot}%{_prefix}/[A-Z]*
-%post -n libmysqlcppconn6 -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
-%postun -n libmysqlcppconn6 -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
%files -n libmysqlcppconn-devel
%defattr(-,root,root)
@@ -136,7 +106,7 @@
%{_includedir}/*
%{_libdir}/*.so
-%files -n libmysqlcppconn6
+%files -n %{libname}
%defattr(-,root,root)
%{_libdir}/*.so.*
++++++ mariadb_api.patch ++++++
Index: mysql-connector-c++-1.1.6/driver/nativeapi/libmysql_static_proxy.cpp
===================================================================
--- mysql-connector-c++-1.1.6.orig/driver/nativeapi/libmysql_static_proxy.cpp
+++ mysql-connector-c++-1.1.6/driver/nativeapi/libmysql_static_proxy.cpp
@@ -319,7 +319,7 @@ LibmysqlStaticProxy::options(MYSQL * mys
int
LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const
void *arg)
{
-#if MYSQL_VERSION_ID >= 50703
+#if not defined MARIADB_BASE_VERSION && MYSQL_VERSION_ID >= 50703
if (::mysql_get_option(mysql, option, arg)) {
throw sql::InvalidArgumentException("Unsupported option
provided to mysql_get_option()");
} else {
Index: mysql-connector-c++-1.1.6/driver/mysql_connection.cpp
===================================================================
--- mysql-connector-c++-1.1.6.orig/driver/mysql_connection.cpp
+++ mysql-connector-c++-1.1.6/driver/mysql_connection.cpp
@@ -1003,6 +1003,7 @@ MySQL_Connection::getClientOption(const
MY_CHARSET_INFO cs;
proxy->get_character_set_info(&cs);
*(static_cast<int *>(optionValue)) = cs.mbmaxlen;
+#ifndef MARIADB_BASE_VERSION
/* mysql_get_option() was added in mysql 5.7.3 version */
} else if ( proxy->get_server_version() >= 50703 ) {
try {
@@ -1017,6 +1018,7 @@ MySQL_Connection::getClientOption(const
CPP_ERR_FMT("Unsupported option : %d:(%s) %s",
proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str());
throw e;
}
+#endif /* MARIADB_BASE_VERSION */
}
}
/* }}} */
@@ -1034,11 +1036,13 @@ MySQL_Connection::getClientOption(const
MY_CHARSET_INFO cs;
proxy->get_character_set_info(&cs);
return cs.dir ? sql::SQLString(cs.dir) : "";
+#ifndef MARIADB_BASE_VERSION
} else if ( proxy->get_server_version() >= 50703 ) {
const char* optionValue= NULL;
if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) {
return optionValue ? sql::SQLString(optionValue) : "";
}
+#endif /* MARIADB_BASE_VERSION */
}
return "";
}
Index: mysql-connector-c++-1.1.6/driver/nativeapi/libmysql_dynamic_proxy.cpp
===================================================================
--- mysql-connector-c++-1.1.6.orig/driver/nativeapi/libmysql_dynamic_proxy.cpp
+++ mysql-connector-c++-1.1.6/driver/nativeapi/libmysql_dynamic_proxy.cpp
@@ -434,6 +434,7 @@ LibmysqlDynamicProxy::options(MYSQL * my
int
LibmysqlDynamicProxy::get_option(MYSQL * mysql, enum mysql_option option,
const void *arg)
{
+#if not defined MARIADB_BASE_VERSION && MYSQL_VERSION_ID >= 50703
ptr2mysql_get_option ptr2_get_option =
symbol_safe_cast<ptr2mysql_options4>(GetProcAddr("mysql_get_option"));
if (ptr2_get_option != NULL) {
if (((*ptr2_get_option)(mysql, option, arg))) {
@@ -444,6 +445,9 @@ LibmysqlDynamicProxy::get_option(MYSQL *
} else {
throw
::sql::MethodNotImplementedException("::mysql_get_option()");
}
+#else
+ throw ::sql::MethodNotImplementedException("::mysql_get_option()");
+#endif
}
/* }}} */
@@ -813,7 +817,7 @@ LibmysqlDynamicProxy::stmt_free_result(M
{
ptr2mysql_stmt_free_result ptr2_stmt_free_result =
symbol_safe_cast<ptr2mysql_stmt_free_result>(GetProcAddr("mysql_stmt_free_result"));
- return (*ptr2_stmt_next_result)(stmt);
+ return (*ptr2_stmt_free_result)(stmt);
}
/* }}} */
++++++ mysql-connector-cpp-1.1.0-disable_tests_and_examples.patch ++++++
--- /var/tmp/diff_new_pack.1n6XYW/_old 2015-08-17 15:33:28.000000000 +0200
+++ /var/tmp/diff_new_pack.1n6XYW/_new 2015-08-17 15:33:28.000000000 +0200
@@ -1,7 +1,8 @@
-diff -rupN mysql-connector-c++-1.1.2/CMakeLists.txt
mysql-connector-c++-1.1.2_mod/CMakeLists.txt
---- mysql-connector-c++-1.1.2/CMakeLists.txt 2013-01-24 16:45:15.000000000
+0100
-+++ mysql-connector-c++-1.1.2_mod/CMakeLists.txt 2013-02-13
21:35:51.503045611 +0100
-@@ -291,11 +291,6 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/
+Index: mysql-connector-c++-1.1.6/CMakeLists.txt
+===================================================================
+--- mysql-connector-c++-1.1.6.orig/CMakeLists.txt
++++ mysql-connector-c++-1.1.6/CMakeLists.txt
+@@ -372,11 +372,6 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/
ADD_SUBDIRECTORY(cppconn)
ADD_SUBDIRECTORY(driver)
@@ -12,4 +13,4 @@
-ADD_SUBDIRECTORY(test/unit)
IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
- # see also README
+ # see also README
