From d95cec3b8798e88b494e1814adebd7e65fe2e472 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Jul 02 2021 03:48:09 +0000
Subject: Fix the default configuration of MySQL driver comming from "mysql-connector-odbc" package

This change is applicable for Fedora >= 34

---

diff --git a/README.dist b/README.dist
index 6a68032..98cece0 100644
--- a/README.dist
+++ b/README.dist
@@ -13,8 +13,8 @@ The recommended driver definition for MySQL 8 is:
 
 [MySQL]
 Description	= ODBC for MySQL 8
-Driver		= /usr/lib/libmyodbc8.so
-Driver64	= /usr/lib64/libmyodbc8.so
+Driver		= /usr/lib/unixODBC/libmyodbc8.so
+Driver64	= /usr/lib64/unixODBC/libmyodbc8.so
 FileUsage	= 1
 
 You can adjust the name (in square brackets) and the description, but
diff --git a/odbcinst.ini b/odbcinst.ini
index 471f20e..d5cce5c 100644
--- a/odbcinst.ini
+++ b/odbcinst.ini
@@ -18,8 +18,10 @@ Description     = ODBC for MySQL 8
 # mysql-connector-odbc package provides shared libraries with "w" or "a" suffix.
 # 'w' stands for 'wide' or 'unicode' character set, 'a' stands for 'ANSI'
 # Symlinks used in the configuration below lead to the 'w' variant by default
-Driver          = /usr/lib/libmyodbc8.so
-Driver64        = /usr/lib64/libmyodbc8.so
+# Note:
+#   The path to the plugin changed from "/usr/lib64" to "/usr/lib64/unixODBC/" beginning with Fedora 33
+Driver          = /usr/lib/unixODBC/libmyodbc8.so
+Driver64        = /usr/lib64/unixODBC/libmyodbc8.so
 FileUsage       = 1
 
 
diff --git a/unixODBC.spec b/unixODBC.spec
index e249a7b..80b3287 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
 Version: 2.3.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
 License: GPLv2+ and LGPLv2+
@@ -129,6 +129,10 @@ done
 %_libdir/pkgconfig/*.pc
 
 %changelog
+* Fri Jul 02 2021 Michal Schorm <mschorm@redhat.com> - 2.3.9-3
+- Bump release after fix of the default configuration for MySQL driver
+  comming from "mysql-connector-odbc" package
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild