From 53bee2c1cb5f2f55d2ca664be44c43207a5ef984 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Sun, 7 Jan 2024 22:16:18 +0100
Subject: [PATCH] Rebase to 3.2.1 - RC

--

Upstream release notes:
  https://mariadb.com/kb/en/mariadb-connector-odbc-3-2-0-release-notes/
  https://mariadb.com/kb/en/mariadb-connector-odbc-3-2-1-release-notes/
Upstream changelog:
  https://mariadb.com/kb/en/mariadb-connector-odbc-3-2-0-changelog/
  https://mariadb.com/kb/en/mariadb-connector-odbc-3-2-1-changelog/

--

abipkgdiff --d1 ./mariadb-connector-odbc-debuginfo-3.1.20-2.fc40.x86_64.rpm --d2 ./mariadb-connector-odbc-debuginfo-3.2.1-1.rc.fc40.x86_64.rpm ./mariadb-connector-odbc-3.1.20-2.fc40.x86_64.rpm ./mariadb-connector-odbc-3.2.1-1.rc.fc40.x86_64.rpm
================ changes of 'libmaodbc.so'===============
  Functions changes summary: 0 Removed, 0 Changed, 1 Added function
  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable

  1 Added function:

    [A] 'function SQLRETURN SQLCancelHandle(SQLSMALLINT, SQLHANDLE)'    {SQLCancelHandle}

================ end of changes of 'libmaodbc.so'===============
---
 libraries_include_path.patch | 33 ---------------------------------
 mariadb-connector-odbc.spec  | 14 +++++++-------
 sources                      |  2 +-
 3 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 libraries_include_path.patch

diff --git a/libraries_include_path.patch b/libraries_include_path.patch
deleted file mode 100644
index ca8bdf7..0000000
--- a/libraries_include_path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- mariadb-connector-odbc-3.0.6-ga-src/ma_odbc.h	2018-07-31 13:39:02.000000000 +0200
-+++ mariadb-connector-odbc-3.0.6-ga-src/ma_odbc.h_patched	2018-08-01 16:10:09.962798000 +0200
-@@ -29,7 +29,7 @@
- 
- #include <stdlib.h>
- 
--#include <mysql.h>
-+#include <mysql/mysql.h>
- 
- #include <ma_legacy_helpers.h>
- 
-@@ -37,7 +37,7 @@
- #include <sqlext.h>
- #include <odbcinst.h>
- 
--#include <errmsg.h>
-+#include <mysql/errmsg.h>
- #include <string.h>
- #include <stdio.h>
- #include <math.h>
-
---- mariadb-connector-odbc-3.1.10-ga-src/ma_conv_charset.h.old	2020-10-26 11:37:51.314034870 +0100
-+++ mariadb-connector-odbc-3.1.10-ga-src/ma_conv_charset.h	2020-10-26 11:38:05.860205545 +0100
-@@ -23,7 +23,7 @@
- #ifndef _MA_CONV_CHARSET_H_
- #define _MA_CONV_CHARSET_H_
- 
--#include "mariadb_ctype.h"
-+#include <mysql/mariadb_ctype.h>
- 
- size_t MADB_ConvertString(const char *from __attribute__((unused)),
-                           size_t *from_len __attribute__((unused)),
-
diff --git a/mariadb-connector-odbc.spec b/mariadb-connector-odbc.spec
index 7dfa9cd..4274e6d 100644
--- a/mariadb-connector-odbc.spec
+++ b/mariadb-connector-odbc.spec
@@ -4,19 +4,17 @@
 
 
 Name:           mariadb-connector-odbc
-Version:        3.1.20
-Release:        2%{?with_debug:.debug}%{?dist}
+Version:        3.2.1
+Release:        1.rc%{?with_debug:.debug}%{?dist}
 Summary:        The MariaDB Native Client library (ODBC driver)
 License:        LGPL-2.1-or-later
-Source:         https://archive.mariadb.org/connector-odbc-%{version}/%{name}-%{version}-src.tar.gz
+Source:         https://archive.mariadb.org/connector-odbc-%{version}/%{name}-%{version}-rc-src.tar.gz
 Url:            https://mariadb.org/en/
 # Online documentation can be found at: https://mariadb.com/kb/en/library/mariadb-connector-odbc/
 
 BuildRequires:  cmake unixODBC-devel gcc-c++
 BuildRequires:  mariadb-connector-c-devel >= 3.3.8
 
-Patch1:         libraries_include_path.patch
-
 %description
 MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using
 the industry standard Open Database Connectivity (ODBC) API. It supports ODBC
@@ -26,8 +24,7 @@ and it supports both Unicode and ANSI modes.
 
 
 %prep
-%setup -q -n %{name}-%{version}-src
-%patch -P1 -p1
+%setup -q -n %{name}-%{version}-rc-src
 
 
 
@@ -77,6 +74,9 @@ FCFLAGS="$FCFLAGS   -O0 -g"; export FCFLAGS
 
 
 %changelog
+* Sun Jan 07 2024 Michal Schorm <mschorm@redhat.com> - 3.2.1-1.rc
+- Rebase to 3.2.1 RC
+
 * Sun Jan 07 2024 Michal Schorm <mschorm@redhat.com> - 3.1.20-2
 - Fix minimal required version of mariadb-connector-c as per:
   https://mariadb.com/kb/en/mariadb-connector-odbc-3-1-20-release-notes/
diff --git a/sources b/sources
index 6678ba2..1f5d49e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-connector-odbc-3.1.20-src.tar.gz) = 898c9faea3c62cf825267c50be589697c016fbda5af7e5dae9e60830e8f6e5bbf1a3c24b240967042823dc361c50fb6f5df59e3dc30bc2c6c0f600cf433e7ba3
+SHA512 (mariadb-connector-odbc-3.2.1-rc-src.tar.gz) = 2ac9539a4b280d4f814233c8300a761b7ab0faa2a7fbbb5336f1531adfeed682016bb370a1dd311237b40f7bcb05299caddf6c9efb8a75ecd253109be3146021