diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..0a80fdce31f59c062e2abba28776e9521eddff30 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..171ce6cee7f1b39fc4965ffb8b76a431dc69df37 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/mariadb diff --git a/mariadb-10.5.25.tar.gz b/mariadb-10.5.25.tar.gz index 9046fa149edd9c4858586d79acbbff3b991d4fdf..c7b8e76450721e1a595d968473c39a0588e46dc2 100644 Binary files a/mariadb-10.5.25.tar.gz and b/mariadb-10.5.25.tar.gz differ diff --git a/mariadb.spec b/mariadb.spec index d3be165f351047dfbc1f687c2c2d13a3e5549347..81b4b66c16ed333dd643857e0c156ef7676acfe1 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -74,7 +74,7 @@ Name: mariadb Version: 10.5.25 -Release: 2 +Release: 4 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 . \ +%cmake -B %{__cmake_builddir} \ -DBUILD_CONFIG=mysql_release \ -DFEATURE_SET="community" \ -DINSTALL_LAYOUT=RPM \ @@ -770,8 +770,8 @@ CXXFLAGS="$CFLAGS" CPPFLAGS="$CFLAGS" export CFLAGS CXXFLAGS CPPFLAGS -cmake -B . -LAH -cmake --build . %{?_smp_mflags} --verbose +%cmake -LAH +%cmake_build # build selinux policy %if %{with galera} @@ -782,14 +782,14 @@ make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp %install -DESTDIR="%{buildroot}" cmake --install "." +%cmake_install # multilib header support #1625157 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,12 @@ 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 + * Sun Aug 18 2024 binshuo - 4:10.5.25-2 - RISC-V: fix 'rdcycle' SIGILL