diff --git a/add-sw64-to-lib64-matches.patch b/add-sw64-to-lib64-matches.patch new file mode 100644 index 0000000000000000000000000000000000000000..81c0f0566e3c568bc03b1001130c5232d858ab01 --- /dev/null +++ b/add-sw64-to-lib64-matches.patch @@ -0,0 +1,25 @@ +From 9c0669695952a6d5b1edbb59e95d24ad155e66c7 Mon Sep 17 00:00:00 2001 +From: xunian +Date: Fri, 14 Mar 2025 09:15:53 +0800 +Subject: [PATCH] add sw64 to lib64 matches + +--- + cmake/install.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/install.cmake b/cmake/install.cmake +index 90bae8b..ab2cff8 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -76,7 +76,7 @@ SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient") + # RPM layout + # + SET(INSTALL_BINDIR_RPM "bin") +-IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") AND CMAKE_SIZEOF_VOID_P EQUAL 8) ++IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x" OR CMAKE_SYSTEM_PROCESSOR MATCHES "sw_64") AND CMAKE_SIZEOF_VOID_P EQUAL 8) + SET(INSTALL_LIBDIR_RPM "lib64/mariadb") + SET(INSTALL_PCDIR_RPM "lib64/pkgconfig") + SET(INSTALL_PLUGINDIR_RPM "lib64/mariadb/plugin") +-- +2.41.0 + diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index 698c31571bd0ad8a960eb2824993d5f22d0b5622..3fcebf40e4ebbbae6beb879c5dec294f3f93af79 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %bcond_with debug %bcond_without testsuite @@ -17,6 +17,8 @@ Patch0000: mariadb-connector-c-3.3.7-do-not-install-man3.patch %if %{with testsuite} Patch0002: testsuite.patch %endif +Patch0003: add-sw64-to-lib64-matches.patch + BuildRequires: libcurl-devel krb5-devel openssl-devel zlib-devel libzstd-devel BuildRequires: gcc-c++ cmake @@ -77,6 +79,7 @@ Manual pages documenting API of the libmariadb.so library for %{name}. %if %{with testsuite} %patch -P0002 -p1 %endif +%patch -P0003 -p1 rm -r win win-iconv external/zlib @@ -178,6 +181,9 @@ install -D -pm0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf %doc README %changelog +* Mon Mar 31 2025 xunian - 3.4.4-2 +- Add sw_64 support + * 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