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 deleted file mode 100644 index 657b5f6be7323ab87346be57ca2a7440e4be4291..0000000000000000000000000000000000000000 --- a/mariadb-connector-c-3.3.7-disalbe-warning-as-error.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 @@ - ELSEIF(CMAKE_C_COMPILER_ID MATCHES "MSVC") - SET(WARNING_AS_ERROR "/WX" CACHE INTERNAL "WARNING_AS_ERROR") - ENDIF() --SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_AS_ERROR}") - - - 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..7db2160dfbde48ec203ef10aa8a941dedccb21e4 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() +@@ -465,10 +465,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.4-src.tar.gz b/mariadb-connector-c-3.4.4-src.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..70d777ad641004d863d8359c2316fd6280ad635a Binary files /dev/null and b/mariadb-connector-c-3.4.4-src.tar.gz differ diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index bbec55e17c1951dac2a57b579123e5e3fa5d770a..698c31571bd0ad8a960eb2824993d5f22d0b5622 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.4 Release: %{anolis_release}%{?dist} License: LGPL-2.1-or-later Url: http://mariadb.org/ @@ -14,9 +14,8 @@ Source2: my.cnf 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 @@ -75,7 +74,6 @@ Manual pages documenting API of the libmariadb.so library for %{name}. %prep %setup -n %{name}-%{version}-src -q %patch -P0000 -p1 -%patch -P0001 -p1 %if %{with testsuite} %patch -P0002 -p1 %endif @@ -152,7 +150,7 @@ install -D -pm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf %{abidir}/remote_io.dump %{abidir}/caching_sha2_password.dump %{abidir}/zstd.dump - +%{abidir}/parsec.dump %files devel %{_bindir}/mysql_config @@ -180,6 +178,10 @@ install -D -pm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf %doc README %changelog +* Mon Mar 17 2025 mgb01105731 - 3.4.4-1 +- Update to 3.4.4 from 3.3.7 +- Remove patches by reason of implemented upstream mechanism + * 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)