diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..c9a618551d7d788cde5f4326178966a3917277e9 --- /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..d9266e2758e699a4f8b8a5178575260efd5d9ee3 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 @@ -1477,6 +1477,10 @@ fi %endif %changelog +* Thu Nov 21 2024 Funda Wang - 4:10.5.25-4 +- adopt to new cmake macro +- sync with master codebase + * Sun Aug 18 2024 binshuo - 4:10.5.25-2 - RISC-V: fix 'rdcycle' SIGILL