diff --git a/mariadb-connector-c-3.3.7-disalbe-warning-as-error.patch b/mariadb-connector-c-3.3.7-disalbe-warning-as-error.patch index 657b5f6be7323ab87346be57ca2a7440e4be4291..01e0156355e6b32d6e0cf0a489e51c369ee43d44 100644 --- a/mariadb-connector-c-3.3.7-disalbe-warning-as-error.patch +++ b/mariadb-connector-c-3.3.7-disalbe-warning-as-error.patch @@ -1,10 +1,11 @@ --- mariadb-connector-c-3.3.7-src/CMakeLists.txt.orig 2023-10-09 15:03:25.988744588 +0800 +++ mariadb-connector-c-3.3.7-src/CMakeLists.txt 2023-10-09 15:03:29.302781562 +0800 -@@ -403,7 +403,6 @@ +@@ -420,8 +420,7 @@ ELSEIF(CMAKE_C_COMPILER_ID MATCHES "MSVC") - SET(WARNING_AS_ERROR "/WX" CACHE INTERNAL "WARNING_AS_ERROR") + SET(WARNING_AS_ERROR "/WX") ENDIF() -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_AS_ERROR}") + ENDIF() IF(NOT REMOTEIO_PLUGIN_TYPE MATCHES "OFF") diff --git a/mariadb-connector-c-3.3.7-do-not-install-man3.patch b/mariadb-connector-c-3.3.7-do-not-install-man3.patch index 8be6f792a355c294dd8cb3a8096ad5bd0be57069..a7e78ac53f458b4e85817090fc5e0ddfea04f92c 100644 --- a/mariadb-connector-c-3.3.7-do-not-install-man3.patch +++ b/mariadb-connector-c-3.3.7-do-not-install-man3.patch @@ -1,8 +1,8 @@ --- mariadb-connector-c-3.3.7-src/CMakeLists.txt.orig 2023-10-09 14:58:33.081476633 +0800 +++ mariadb-connector-c-3.3.7-src/CMakeLists.txt 2023-10-09 14:58:37.524526206 +0800 -@@ -446,10 +446,6 @@ - COMPONENT SharedLibraries) - ENDIF() +@@ -464,10 +464,6 @@ + # COMPONENT SharedLibraries) + #ENDIF() -IF(UNIX) - ADD_SUBDIRECTORY(man) diff --git a/mariadb-connector-c-3.3.7-src.tar.gz b/mariadb-connector-c-3.3.7-src.tar.gz deleted file mode 100644 index 94e6c0b11f86f2333421555b5fd61581f962c4da..0000000000000000000000000000000000000000 Binary files a/mariadb-connector-c-3.3.7-src.tar.gz and /dev/null differ diff --git a/mariadb-connector-c-3.4.3-src.tar.gz b/mariadb-connector-c-3.4.3-src.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..eca2ee1f4f7859594b1c70a71a90f5c258fe4ef0 Binary files /dev/null and b/mariadb-connector-c-3.4.3-src.tar.gz differ diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index bbec55e17c1951dac2a57b579123e5e3fa5d770a..bfdf50446d08c2d8b12d1a38096ea47933dfac45 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -5,7 +5,7 @@ Name: mariadb-connector-c Summary: The MariaDB Native Client library (C driver) -Version: 3.3.7 +Version: 3.4.3 Release: %{anolis_release}%{?dist} License: LGPL-2.1-or-later Url: http://mariadb.org/ @@ -16,7 +16,7 @@ Source3: client.cnf Patch0000: mariadb-connector-c-3.3.7-do-not-install-man3.patch Patch0001: mariadb-connector-c-3.3.7-disalbe-warning-as-error.patch %if %{with testsuite} -Patch0002: 0002-testsuite.patch +Patch0002: testsuite.patch %endif BuildRequires: libcurl-devel krb5-devel openssl-devel zlib-devel libzstd-devel @@ -33,8 +33,8 @@ both MariaDB and MySQL databases, and it supports all major operating systems. %package devel Summary: Development files for %{name} -Requires: %{name} = %{EVR} -Recommends: %{name}-doc = %{EVR} +Requires: %{name} = %{version}-%{release} +Recommends: %{name}-doc = %{version}-%{release} Requires: openssl-devel zlib-devel Conflicts: mysql-devel @@ -66,7 +66,7 @@ and require this package, so the /etc/my.cnf file is present. %package doc Summary: Manual pages documenting API of the libmariadb.so library -Requires: %{name} = %{EVR} +Requires: %{name} = %{version}-%{release} BuildArch: noarch %description doc @@ -86,6 +86,7 @@ rm -r win win-iconv external/zlib %cmake . \ -DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \ -DCMAKE_SYSTEM_PROCESSOR="%{_arch}" \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=0 \ \ -DMARIADB_UNIX_ADDR=%{_sharedstatedir}/mysql/mysql.sock \ -DMARIADB_PORT=3306 \ @@ -94,6 +95,8 @@ rm -r win win-iconv external/zlib -DWITH_SSL=OPENSSL \ -DWITH_MYSQLCOMPAT=ON \ -DPLUGIN_CLIENT_ED25519=DYNAMIC \ +\ + -DDEFAULT_SSL_VERIFY_SERVER_CERT=OFF \ \ -DINSTALL_LAYOUT=RPM \ -DINSTALL_BINDIR="bin" \ @@ -180,6 +183,9 @@ install -D -pm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf %doc README %changelog +* Wed Feb 19 2025 Hong Wei Qin - 3.4.3-1 +- Refer to CentOS Stream mariadb-connector-c-3.4.3-10 (tdawson@redhat.com) + * Mon Oct 09 2023 Funda Wang - 3.3.7-1 - New version 3.3.7 - Remove man pages from man3, they are in conflict with mariadb-devel (bug#6690) diff --git a/0002-testsuite.patch b/testsuite.patch similarity index 54% rename from 0002-testsuite.patch rename to testsuite.patch index 957f24ba24a66f1bca964088669405c9b7b860c2..0ef957dcb7b2432a34977adfc1445c80a334fb94 100644 --- a/0002-testsuite.patch +++ b/testsuite.patch @@ -1,10 +1,9 @@ ---- mariadb-connector-c-3.1.3-src/unittest/libmariadb/CMakeLists.txt 2019-07-25 10:03:48.000000000 -0400 -+++ mariadb-connector-c-3.1.3-src/unittest/libmariadb/CMakeLists.txt_patched 2019-08-19 17:02:26.317247605 -0400 -@@ -71,3 +71,7 @@ FOREACH(API_TEST ${MANUAL_TESTS}) - ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c) - TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient) +--- mariadb-connector-c-3.4.1-src/unittest/libmariadb/CMakeLists.txt 2024-08-03 16:38:02.000000000 +0200 ++++ mariadb-connector-c-3.4.1-src/unittest/libmariadb/CMakeLists.txt_patched 2024-08-22 23:52:11.773978003 +0200 +@@ -95,3 +95,6 @@ FOREACH(FILE ${ADDITIONAL_FILES}) + COPYONLY) ENDFOREACH() -+ + +INSTALL(TARGETS ${API_TESTS} DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests) +INSTALL(FILES ${CC_BINARY_DIR}/unittest/mytap/libcctap.so PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${INSTALL_LIBDIR} COMPONENT Tests) +INSTALL(FILES ${CC_BINARY_DIR}/unittest/libmariadb/CTestTestfile.cmake DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests)