diff --git a/mariadb.spec b/mariadb.spec
index 96c1522f4d0e1405dc5e723ccb87c5eeb8ae1431..7a74fe06bf0efb545ab3534dc7868f48c6119758 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -2,7 +2,7 @@
 %global pkgnamepatch mariadb
 %{!?runselftest:%global runselftest 0}
 %global ignore_testsuite_result 0
-%global last_tested_version 10.5.25
+%global last_tested_version 10.5.29
 %global force_run_testsuite 0
 %global require_mysql_selinux 1
 
@@ -74,7 +74,7 @@
 
 Name:             mariadb
 Version:          10.5.29
-Release:          1
+Release:          2
 Epoch:            4
 
 Summary:          A very fast and robust SQL database server
@@ -690,7 +690,7 @@ fi
 
 # The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX
 # so we can't use %%{_datadir} and so forth here.
-%cmake -B %{__cmake_builddir} \
+%cmake . \
          -DBUILD_CONFIG=mysql_release \
          -DFEATURE_SET="community" \
          -DINSTALL_LAYOUT=RPM \
@@ -770,8 +770,8 @@ CXXFLAGS="$CFLAGS"
 CPPFLAGS="$CFLAGS"
 export CFLAGS CXXFLAGS CPPFLAGS
 
-%cmake -LAH
-%cmake_build
+cmake -B . -LAH
+cmake --build . %{?_smp_mflags} --verbose
 
 # build selinux policy
 %if %{with galera}
@@ -782,7 +782,7 @@ make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp
 
 
 %install
-%cmake_install
+DESTDIR="%{buildroot}" cmake --install "."
 
 # multilib header support #1625157
 for header in mysql/server/my_config.h mysql/server/private/config.h; do
@@ -808,8 +808,8 @@ rm %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
 
 # install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
 # but that's pretty wacko --- see also %%{name}-file-contents.patch)
-install -p -m 644 %{_builddir}/mariadb-%{version}/%{__cmake_builddir}/Docs/INFO_SRC %{buildroot}%{_libdir}/%{pkg_name}/
-install -p -m 644 %{_builddir}/mariadb-%{version}/%{__cmake_builddir}/Docs/INFO_BIN %{buildroot}%{_libdir}/%{pkg_name}/
+install -p -m 644 %{_builddir}/mariadb-%{version}/Docs/INFO_SRC %{buildroot}%{_libdir}/%{pkg_name}/
+install -p -m 644 %{_builddir}/mariadb-%{version}/Docs/INFO_BIN %{buildroot}%{_libdir}/%{pkg_name}/
 rm -r %{buildroot}%{_datadir}/doc/%{_pkgdocdirname}/MariaDB-server-%{version}/
 
 # Logfile creation
@@ -906,8 +906,8 @@ install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
 
 # install galera config file
 %if %{with galera}
-sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' %{_builddir}/mariadb-%{version}/%{__cmake_builddir}/support-files/wsrep.cnf
-install -p -m 0644 %{_builddir}/mariadb-%{version}/%{__cmake_builddir}/support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
+sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' %{_builddir}/mariadb-%{version}/support-files/wsrep.cnf
+install -p -m 0644 %{_builddir}/mariadb-%{version}/support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
 %endif
 # install the clustercheck script
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
@@ -1477,6 +1477,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 17 2025 xiejing <xiejing@kylinos.cn> - 4:10.5.29-2
+- Revert to the old cmake usage pattern to prevent macro definitions from being overridden
+
 * Fri May 09 2025 Funda Wang <fundawang@yeah.net> - 4:10.5.29-1
 - update to 10.5.29 for CVE-2025-30722, CVE-2025-30693, CVE-2023-52970, CVE-2023-52969
 
diff --git a/mysql.service.in b/mysql.service.in
index ae12df946ff255aa71fb7dba4f0c82010bd6c58a..bf6d9f5f40ed88a693c0f82848c1072eb14d19a6 100644
--- a/mysql.service.in
+++ b/mysql.service.in
@@ -17,7 +17,7 @@
 #
 
 [Unit]
-Description=MariaDB 10.5.25 database server
+Description=MariaDB 10.5.29 database server
 Documentation=man:mariadbd(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
diff --git a/mysql@.service.in b/mysql@.service.in
index f250f51121173eb12e47167c8177908b2f4604a0..3c7132c05b5e5dae54f6db6b120b2b35471cf918 100644
--- a/mysql@.service.in
+++ b/mysql@.service.in
@@ -39,7 +39,7 @@
 #	LimitNOFILE=10000
 
 [Unit]
-Description=MariaDB 10.5.25 database server (multi-instance %I)
+Description=MariaDB 10.5.29 database server (multi-instance %I)
 Documentation=man:mariadbd(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target