!117 【openEuler-24.03-LTS-SP1】revert to 10.5.25-2

From: @yang-chaohao 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2024-12-20 11:47:39 +00:00 committed by Gitee
commit 085a1496dd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 13 additions and 13 deletions

1
.gitattributes vendored
View File

@ -1 +0,0 @@
*.gz filter=lfs diff=lfs merge=lfs -text

View File

@ -1,2 +0,0 @@
[lfs]
url = https://artlfs.openeuler.openatom.cn/src-openEuler/mariadb

Binary file not shown.

View File

@ -74,7 +74,7 @@
Name: mariadb Name: mariadb
Version: 10.5.25 Version: 10.5.25
Release: 4 Release: 5
Epoch: 4 Epoch: 4
Summary: A very fast and robust SQL database server 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 # The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX
# so we can't use %%{_datadir} and so forth here. # so we can't use %%{_datadir} and so forth here.
%cmake -B %{__cmake_builddir} \ %cmake . \
-DBUILD_CONFIG=mysql_release \ -DBUILD_CONFIG=mysql_release \
-DFEATURE_SET="community" \ -DFEATURE_SET="community" \
-DINSTALL_LAYOUT=RPM \ -DINSTALL_LAYOUT=RPM \
@ -770,8 +770,8 @@ CXXFLAGS="$CFLAGS"
CPPFLAGS="$CFLAGS" CPPFLAGS="$CFLAGS"
export CFLAGS CXXFLAGS CPPFLAGS export CFLAGS CXXFLAGS CPPFLAGS
%cmake -LAH cmake -B . -LAH
%cmake_build cmake --build . %{?_smp_mflags} --verbose
# build selinux policy # build selinux policy
%if %{with galera} %if %{with galera}
@ -782,14 +782,14 @@ make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp
%install %install
%cmake_install DESTDIR="%{buildroot}" cmake --install "."
# multilib header support #1625157 # multilib header support #1625157
for header in mysql/server/my_config.h mysql/server/private/config.h; do for header in mysql/server/my_config.h mysql/server/private/config.h; do
%multilib_fix_c_header --file %{_includedir}/$header %multilib_fix_c_header --file %{_includedir}/$header
done done
ln -sf mysql_config.1 %{buildroot}%{_mandir}/man1/mariadb_config.1 ln -s mysql_config.1.gz %{buildroot}%{_mandir}/man1/mariadb_config.1.gz
# multilib support for shell scripts # multilib support for shell scripts
# we only apply this to known Red Hat multilib arches, per bug #181335 # 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, # install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
# but that's pretty wacko --- see also %%{name}-file-contents.patch) # 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}/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_BIN %{buildroot}%{_libdir}/%{pkg_name}/
rm -r %{buildroot}%{_datadir}/doc/%{_pkgdocdirname}/MariaDB-server-%{version}/ rm -r %{buildroot}%{_datadir}/doc/%{_pkgdocdirname}/MariaDB-server-%{version}/
# Logfile creation # Logfile creation
@ -906,8 +906,8 @@ install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
# install galera config file # install galera config file
%if %{with galera} %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 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}/%{__cmake_builddir}/support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf install -p -m 0644 %{_builddir}/mariadb-%{version}/support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
%endif %endif
# install the clustercheck script # install the clustercheck script
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
@ -1477,6 +1477,9 @@ fi
%endif %endif
%changelog %changelog
* Fri Dec 20 2024 yangchaohao <yangchaohao@huawei.com> - 4:10.5.25-5
- revert to 10.5.25-2
* Thu Nov 21 2024 Funda Wang <fundawang@yeah.net> - 4:10.5.25-4 * Thu Nov 21 2024 Funda Wang <fundawang@yeah.net> - 4:10.5.25-4
- adopt to new cmake macro - adopt to new cmake macro