Accepting request 889298 from home:dimstar:Factory

- Add mariadb-10.5.9-cmake-3.20.patch: Fix syntax error which is
  exposed by cmake 3.20.

OBS-URL: https://build.opensuse.org/request/show/889298
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=269

mariadb-10.5.9-cmake-3.20.patch

@@ -0,0 +1,19 @@
+Subject: [PATCH] Fix syntax error in cmake 3.20
+
+---
+ cmake/ConnectorName.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake
+===================================================================
+--- mariadb-10.5.9.orig/libmariadb/cmake/ConnectorName.cmake
++++ mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake
+@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+     SET(MACHINE_NAME "x64")
+   ELSE()
+     SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")

mariadb.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 29 12:10:29 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add mariadb-10.5.9-cmake-3.20.patch: Fix syntax error which is
+  exposed by cmake 3.20.
+
 -------------------------------------------------------------------
 Fri Mar 12 22:07:53 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
 

mariadb.spec

@@ -85,6 +85,7 @@ Patch4:         mariadb-10.2.4-fortify-and-O.patch
 Patch5:         mariadb-10.2.19-link-and-enable-c++11-atomics.patch
 Patch6:         mariadb-10.4.12-harden_setuid.patch
 Patch7:         mariadb-10.4.12-fix-install-db.patch
+Patch8:         mariadb-10.5.9-cmake-3.20.patch
 # needed for bison SQL parser and wsrep API
 BuildRequires:  bison
 BuildRequires:  cmake
@@ -373,6 +374,7 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 cp %{_sourcedir}/suse-test-run .