From 05fa7d6febc422e103702e4334f57fb8a3dab3a5cc11d73e8492e3d895f17b5a Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 29 Apr 2021 15:14:14 +0000
Subject: [PATCH] Accepting request 889284 from home:dimstar:Factory

- Add mariadb-connector-c-cmake-3.20.patch: Fix build with cmake
  3.20.

Fixes build error in Staging:D / cmake 3.20.1

OBS-URL: https://build.opensuse.org/request/show/889284
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=65
---
 mariadb-connector-c-cmake-3.20.patch | 24 ++++++++++++++++++++++++
 mariadb-connector-c.changes          |  8 +++++++-
 mariadb-connector-c.spec             |  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 mariadb-connector-c-cmake-3.20.patch

diff --git a/mariadb-connector-c-cmake-3.20.patch b/mariadb-connector-c-cmake-3.20.patch
new file mode 100644
index 0000000..10af29c
--- /dev/null
+++ b/mariadb-connector-c-cmake-3.20.patch
@@ -0,0 +1,24 @@
+From 242cab8cbcd91af882233730a83627d3b12ced83 Mon Sep 17 00:00:00 2001
+From: Vladislav Vaintroub <wlad@mariadb.com>
+Date: Fri, 12 Mar 2021 00:01:11 +0100
+Subject: [PATCH] Fix syntax error in cmake 3.20
+
+https://github.com/mariadb-corporation/mariadb-connector-c/commit/242cab8cbc
+
+---
+ cmake/ConnectorName.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake
+index b7bbbad8..357b8ac0 100644
+--- a/cmake/ConnectorName.cmake
++++ b/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}")
diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes
index 1ffc013..6c4ddea 100644
--- a/mariadb-connector-c.changes
+++ b/mariadb-connector-c.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 29 12:04:20 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add mariadb-connector-c-cmake-3.20.patch: Fix build with cmake
+  3.20.
+
 -------------------------------------------------------------------
 Wed Mar  3 23:31:24 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
 
@@ -7,7 +13,7 @@ Wed Mar  3 23:31:24 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
   * CONC-521: Fixed warning on MacOS when including ucontext.h
   * CONC-518: Check if mysql->options.extension was allocated before
     checking async_context
-  * CONC-517: C/C looks for plugins in wrong location on Windows 
+  * CONC-517: C/C looks for plugins in wrong location on Windows
 
 -------------------------------------------------------------------
 Thu Nov  5 13:53:30 UTC 2020 - Adam Majer <adam.majer@suse.de>
diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec
index 59222ed..f7a88ce 100644
--- a/mariadb-connector-c.spec
+++ b/mariadb-connector-c.spec
@@ -39,6 +39,7 @@ Source3:        baselibs.conf
 Patch1:         mariadb-connector-c-2.3.1_unresolved_symbols.patch
 Patch3:         absolute_path_fix.patch
 Patch4:         private_library.patch
+Patch5:         mariadb-connector-c-cmake-3.20.patch
 BuildRequires:  cmake
 BuildRequires:  curl-devel
 BuildRequires:  pkgconfig
@@ -115,6 +116,7 @@ This package holds the development files.
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # plugin types seems to require no aliasing assumptions