Rebase to 10.5.5

Add manual for aria_s3_copy
This commit is contained in:
Lukas Javorsky 2020-09-21 11:31:59 +02:00 committed by Michal Schorm
parent 2b8b704762
commit 21e76c8255
3 changed files with 11 additions and 8 deletions

View File

@ -2,11 +2,11 @@ We have some downstream patches and other scripts that include variables to
be expanded by cmake. Cmake needs to know about them, so adding them manually.
# Install libgcc as mylibgcc.a
--- mariadb-10.5.2/scripts/CMakeLists.txt 2020-03-25 11:13:17.000000000 +0100
+++ mariadb-10.5.2/scripts/CMakeLists.txt_patched 2020-04-01 01:26:59.398940396 +0200
@@ -377,6 +377,34 @@ ELSE()
COMPONENT ${${file}_COMPONENT}
)
--- mariadb-10.5.5/scripts/CMakeLists.txt.old 2020-09-24 10:13:35.272589689 +0200
+++ mariadb-10.5.5/scripts/CMakeLists.txt 2020-09-24 10:17:31.428985798 +0200
@@ -377,6 +377,34 @@
INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT})
ENDIF()
ENDFOREACH()
+
+ # files for systemd

View File

@ -153,7 +153,7 @@
%global sameevr %{epoch}:%{version}-%{release}
Name: mariadb
Version: 10.5.4
Version: 10.5.5
Release: 1%{?with_debug:.debug}%{?dist}
Epoch: 3
@ -1403,7 +1403,7 @@ fi
%exclude %{_libdir}/%{pkg_name}/plugin/mysql_clear_password.so
%endif
%{_mandir}/man1/aria_{chk,dump_log,ftdump,pack,read_log}.1*
%{_mandir}/man1/aria_{chk,dump_log,ftdump,pack,read_log,s3_copy}.1*
%{_mandir}/man1/galera_new_cluster.1*
%{_mandir}/man1/galera_recovery.1*
%{_mandir}/man1/mariadb-service-convert.1*
@ -1601,6 +1601,9 @@ fi
%endif
%changelog
* Mon Sep 21 2020 Lukas Javorsky <ljavorsk@redhat.com> - 10.5.5-1
- Rebase to 10.5.5
* Wed Sep 16 2020 Lukas Javorsky <ljavorsk@redhat.com> - 10.5.4-1
- Rebase to 10.5.4
- Add spider.cnf to the server config files

View File

@ -1 +1 @@
SHA512 (mariadb-10.5.4.tar.gz) = f949cee6e227e4633f95ab826db7976ed76340eb6dfcbee1eb698e6779b669a8593b2dc733b6a442a60ed95840a627e0551f07a37f2b7738fb03cf1e367f4e1d
SHA512 (mariadb-10.5.5.tar.gz) = 09bed291b39142f8e2f40eabbb443f6f384368b331406a09fd92d3d27ecc75644219066850d89495ed65c6f0d3ac32d51e29e65375331dcc2de4801313178d45