From 21fb29f9a18edab72de3ea9a04f902ba0231720b Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Thu, 9 Apr 2020 03:42:54 +0200
Subject: [PATCH] Rebase to 10.5.2 - Beta TokuDB SE has been deprecated
 https://jira.mariadb.org/browse/MDEV-19780

---
 mariadb-ownsetup.patch     | 10 +++++-----
 mariadb-pcdir.patch        |  9 ++++-----
 mariadb-scripts.patch      |  9 +++++----
 mariadb.spec               | 19 ++++++++++++++++---
 rh-skipped-tests-base.list |  3 +++
 sources                    |  2 +-
 6 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/mariadb-ownsetup.patch b/mariadb-ownsetup.patch
index 23dcba8..7b6f609 100644
--- a/mariadb-ownsetup.patch
+++ b/mariadb-ownsetup.patch
@@ -1,12 +1,12 @@
-diff -up mariadb-10.1.8/support-files/CMakeLists.txt.p9 mariadb-10.1.8/support-files/CMakeLists.txt
---- mariadb-10.1.8/support-files/CMakeLists.txt.p9	2015-11-03 11:38:46.029139464 +0100
-+++ mariadb-10.1.8/support-files/CMakeLists.txt	2015-11-03 11:41:07.107605055 +0100
-@@ -62,6 +62,7 @@ IF(UNIX)
+diff -Naup mariadb-10.1.8/support-files/CMakeLists.txt mariadb-10.1.8/support-files/CMakeLists.txt_patched
+--- mariadb-10.5.2/support-files/CMakeLists.txt	2020-03-25 11:13:19.000000000 +0100
++++ mariadb-10.5.2/support-files/CMakeLists.txt_patched	2020-04-01 01:29:52.140847301 +0200
+@@ -91,6 +91,7 @@ IF(UNIX)
    ENDIF()
  
    CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
 +  CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)
  
    INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
 diff -up mariadb-10.1.8/support-files/rpm/server.cnf.p9 mariadb-10.1.8/support-files/rpm/server.cnf
diff --git a/mariadb-pcdir.patch b/mariadb-pcdir.patch
index d9a8a78..87b70b2 100644
--- a/mariadb-pcdir.patch
+++ b/mariadb-pcdir.patch
@@ -3,18 +3,17 @@ Use PCDIR CMake option, if configured
 Upstream install the server pkgconfig file into arch-independent directory
 Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340
 
---- mariadb-10.3.12/support-files/CMakeLists.txt	2019-03-20 15:25:53.423283135 +0100
-+++ mariadb-10.3.12/support-files/CMakeLists.txt_patched	2019-03-20 15:38:56.372819958 +0100
-@@ -82,7 +82,12 @@ IF(UNIX)
+--- mariadb-10.5.2/support-files/CMakeLists.txt	2020-04-01 01:31:21.426832942 +0200
++++ mariadb-10.5.2/support-files/CMakeLists.txt_patched	2020-04-01 01:35:05.808309914 +0200
+@@ -92,7 +92,11 @@ IF(UNIX)
  
    CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
    CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
 +IF(INSTALL_PCDIR)
 +  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_PCDIR} COMPONENT Development)
 +ELSE()
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)
 +ENDIF()
-+
  
    INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
    
diff --git a/mariadb-scripts.patch b/mariadb-scripts.patch
index b684482..19f576e 100644
--- a/mariadb-scripts.patch
+++ b/mariadb-scripts.patch
@@ -1,11 +1,12 @@
 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.
 
---- mariadb-10.3.8/scripts/CMakeLists.txt	2018-07-02 09:34:11.000000000 +0200
-+++ mariadb-10.3.8/scripts/CMakeLists.txt_patched	2018-07-03 10:58:15.954670153 +0200
-@@ -361,6 +361,34 @@ ELSE()
+ # 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}
-      )
+     )
    ENDFOREACH()
 +
 +  # files for systemd
diff --git a/mariadb.spec b/mariadb.spec
index 02445ec..8b5c8d5 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -28,9 +28,10 @@
 
 
 
-# TokuDB engine
+# TokuDB engine - DEPRECATED !
 #   https://mariadb.com/kb/en/mariadb/tokudb/
 #   TokuDB engine is available only for x86_64
+#   The Percona upstream deprecated the SE. It is not part of MariaDB 10.5
 # Mroonga engine
 #   https://mariadb.com/kb/en/mariadb/about-mroonga/
 #   Current version in MariaDB, 7.07, only supports the x86_64
@@ -40,7 +41,8 @@
 #   RocksDB engine is available only for x86_64
 #   RocksDB may be built with jemalloc, if specified in CMake
 %if "%_arch" == "x86_64" && 0%{?fedora}
-%bcond_without tokudb
+# TokuDB is deprecated in MariaDB 10.5 and later
+%bcond_with tokudb
 %bcond_without mroonga
 %bcond_without rocksdb
 %else
@@ -146,7 +148,7 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.1
+Version:          10.5.2
 Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
@@ -990,6 +992,10 @@ rm %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server
 # Binary for monitoring MySQL performance
 # Shipped as a standalone package in Fedora
 rm %{buildroot}%{_bindir}/mytop
+rm %{buildroot}%{_mandir}/man1/mytop.1*
+
+# Should be shipped with mariadb-connector-c
+rm %{buildroot}%{_mandir}/man1/mariadb-config.1*
 
 # put logrotate script where it needs to be
 mkdir -p %{buildroot}%{logrotateddir}
@@ -1398,6 +1404,8 @@ fi
 %{_mandir}/man1/myisam_ftdump.1*
 %{_mandir}/man1/my_print_defaults.1*
 
+%{_mandir}/man1/mariadb-conv.1*
+
 %{_mandir}/man1/mysql_{install_db,secure_installation,tzinfo_to_sql}.1*
 %{_mandir}/man1/mariadb-{install-db,secure-installation,tzinfo-to-sql}.1*
 %{_mandir}/man1/{mysqld_,mariadbd-}safe.1*
@@ -1487,6 +1495,7 @@ fi
 %{_bindir}/sst_dump
 %{_libdir}/%{pkg_name}/plugin/ha_rocksdb.so
 %{_mandir}/man1/{mysql_,mariadb-}ldb.1*
+%{_mandir}/man1/myrocks_hotbackup.1*
 %endif
 
 %if %{with tokudb}
@@ -1587,6 +1596,10 @@ fi
 %endif
 
 %changelog
+* Thu Apr 09 2020 Michal Schorm <mschorm@redhat.com> - 10.5.2-1
+- Test rebase to 10.5.2 - Beta
+- TokuDB SE has been deprecated
+
 * Thu Apr 09 2020 Michal Schorm <mschorm@redhat.com> - 10.5.1-1
 - Test rebase to 10.5.1 - Beta
 
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index 2b101f5..ed154af 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -37,3 +37,6 @@ sys_vars.tcp_nodelay                         :
 
 # Fails on i686
 encryption.innodb-redo-badkey                :
+
+# Fails since 10.5.2
+main.mysqld--help2                           :
diff --git a/sources b/sources
index 59c9f1f..ce5a492 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.5.1.tar.gz) = eef4986fa0ff70b77d9d083ccbe6738d7bfda4236e3098bf37cd41034732cc8a8150a25be19ffb67849d9b29c5f1126c5b38e10e6a1afd9eb8d6d266b3638fb2
+SHA512 (mariadb-10.5.2.tar.gz) = 7abfc4a5543c35ab49ca164a998ed4b31326cb63f57b15449a5de3b62523d99535f378c8a39835f1e8563cf0cea7fd96b13e4f089cbd1546b5e25256c5f9832f