From a5dd4d6f91e9afaa0fa9f28c9bfbf613495aae03 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 21 Nov 2024 11:14:22 +0800 Subject: [PATCH] adopt to new cmake macro --- mariadb.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index c55b721..d1f14a6 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -74,7 +74,7 @@ Name: mariadb Version: 10.5.25 -Release: 3 +Release: 4 Epoch: 4 Summary: A very fast and robust SQL database server @@ -789,7 +789,7 @@ for header in mysql/server/my_config.h mysql/server/private/config.h; do %multilib_fix_c_header --file %{_includedir}/$header done -ln -s mysql_config.1.gz %{buildroot}%{_mandir}/man1/mariadb_config.1.gz +ln -sf mysql_config.1 %{buildroot}%{_mandir}/man1/mariadb_config.1 # multilib support for shell scripts # we only apply this to known Red Hat multilib arches, per bug #181335 @@ -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}/Docs/INFO_SRC %{buildroot}%{_libdir}/%{pkg_name}/ -install -p -m 644 %{_builddir}/mariadb-%{version}/Docs/INFO_BIN %{buildroot}%{_libdir}/%{pkg_name}/ +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}/ 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}/support-files/wsrep.cnf -install -p -m 0644 %{_builddir}/mariadb-%{version}/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}/%{__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 %endif # install the clustercheck script mkdir -p %{buildroot}%{_sysconfdir}/sysconfig @@ -1477,6 +1477,9 @@ fi %endif %changelog +* Thu Nov 21 2024 Funda Wang - 4:10.5.25-4 +- adopt to new cmake macro + * Tue Nov 05 2024 Funda Wang - 4:10.5.25-3 - adopt to new cmake macro -- Gitee