.gitignore

@@ -1 +1 @@
-SOURCES/unixODBC-2.3.7.tar.gz
+SOURCES/unixODBC-2.3.9.tar.gz

.unixODBC.metadata

@@ -1 +1 @@
-a066c4f3fcb19befbaf5a5801b830ec41b7318df SOURCES/unixODBC-2.3.7.tar.gz
+8787833ccfa6b7b6b14a391ae9cbefcff13fb753 SOURCES/unixODBC-2.3.9.tar.gz

SOURCES/README.dist

@@ -9,14 +9,12 @@ postgresql-odbc		PostgreSQL driver, needed to connect to PostgreSQL
 unixODBC-gui-qt		Optional configuration management and test programs
 
 
-The recommended driver definition for MySQL is:
+The recommended driver definition for MySQL 8 is:
 
 [MySQL]
-Description	= ODBC for MySQL
+Description	= ODBC for MySQL 8
-Driver		= /usr/lib/libmyodbc5.so
+Driver		= /usr/lib/libmyodbc8.so
-Setup		= /usr/lib/libodbcmyS.so
+Driver64	= /usr/lib64/libmyodbc8.so
-Driver64	= /usr/lib64/libmyodbc5.so
-Setup64		= /usr/lib64/libodbcmyS.so
 FileUsage	= 1
 
 You can adjust the name (in square brackets) and the description, but

SOURCES/odbcinst.ini

@@ -11,15 +11,30 @@ Setup64		= /usr/lib64/libodbcpsqlS.so
 FileUsage	= 1
 
 
-# Driver from the mysql-connector-odbc package
+# Driver from the mysql-connector-odbc package in Fedora >=29
 # Setup from the unixODBC package
 [MySQL]
-Description	= ODBC for MySQL
+Description     = ODBC for MySQL 8
-Driver		= /usr/lib/libmyodbc5.so
+# mysql-connector-odbc package provides shared libraries with "w" or "a" suffix.
-Setup		= /usr/lib/libodbcmyS.so
+# 'w' stands for 'wide' or 'unicode' character set, 'a' stands for 'ANSI'
-Driver64	= /usr/lib64/libmyodbc5.so
+# Symlinks used in the configuration below lead to the 'w' variant by default
-Setup64		= /usr/lib64/libodbcmyS.so
+Driver          = /usr/lib/libmyodbc8.so
-FileUsage	= 1
+Driver64        = /usr/lib64/libmyodbc8.so
+FileUsage       = 1
+
+
+# Driver from the mysql-connector-odbc package in Fedora <=28
+# Setup from the unixODBC package
+[MySQL-5]
+Description     = ODBC for MySQL 5
+# 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/libmyodbc5.so
+Driver64        = /usr/lib64/libmyodbc5.so
+Setup           = /usr/lib/libodbcmyS.so
+Setup64         = /usr/lib64/libodbcmyS.so
+FileUsage       = 1
 
 
 # Driver from the freetds-libs package

SPECS/unixODBC.spec

@@ -1,8 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
-Version: 2.3.7
+Version: 2.3.9
-Release: 1%{?dist}
+Release: 4%{?dist}
-Group: System Environment/Libraries
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
 License: GPLv2+ and LGPLv2+
@@ -16,6 +15,7 @@ Patch9: keep-typedefs.patch
 
 Conflicts: iodbc
 
+BuildRequires: make
 BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
 BuildRequires: readline-devel
 BuildRequires: multilib-rpm-config
@@ -27,7 +27,6 @@ a MySQL or MariaDB database, and/or the postgresql-odbc package for PostgreSQL.
 
 %package devel
 Summary: Development files for programs which will use the unixODBC library
-Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -76,6 +75,14 @@ cp %{SOURCE5} README.dist
 # remove obsolete Postgres drivers from the package (but not the setup code)
 rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so*
 
+# make directory for unversioned plugins and create appropriate symlinks
+mkdir $RPM_BUILD_ROOT%{_libdir}/%{name}
+cd $RPM_BUILD_ROOT%{_libdir}/%{name}
+ln -s ../libodbcpsqlS.so.2.0.0 libodbcpsqlS.so
+ln -s ../libodbcmyS.so.2.0.0 libodbcmyS.so
+ln -s ../libtdsS.so.2.0.0 libtdsS.so
+cd -
+
 # copy text driver documentation into main doc directory
 # currently disabled because upstream no longer includes text driver
 # mkdir -p doc/Drivers/txt
@@ -97,9 +104,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" > bas
 find $RPM_BUILD_ROOT%{_libdir} -name "*.so"   | sed "s|^$RPM_BUILD_ROOT||" > devel-so-list
 
 # move these to main package, they're often dlopened...
-for lib in libodbc.so libodbcinst.so libodbcpsqlS.so libodbcmyS.so libtdsS.so
+for lib in libodbcpsqlS.so libodbcmyS.so libtdsS.so
 do
-    echo "%{_libdir}/$lib" >> base-so-list
+    echo "%{_libdir}/%{name}/$lib" >> base-so-list
+    rm -f $RPM_BUILD_ROOT%{_libdir}/$lib
     grep -v "/$lib$" devel-so-list > devel-so-list.x
     mv -f devel-so-list.x devel-so-list
 done
@@ -120,10 +128,39 @@ done
 %{_includedir}/*
 %_libdir/pkgconfig/*.pc
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %changelog
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.9-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.9-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Sep 10 2020 Ondrej Dubaj <odubaj@redhat.com> - 2.3.9-1
+- rebase to version 2.3.9
+- move unversioned *.so files back to *-devel package
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.3.7-4
+- Rebuild for readline 8.0
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Nov 30 2018 Michal Schorm <mschorm@redhat.com> - 2.3.7-2
+- Bump for rebuild to ship updated configuration
+
 * Sat Aug 11 2018 Pavel Raiskup <praiskup@redhat.com> - 2.3.7-1
 - update to version 2.3.7