[rpms/unixODBC] rawhide: [bugfix] Fix multilib conflict for 'unixodbc.h' header

[rpms/unixODBC] rawhide: [bugfix] Fix multilib conflict for 'unixodbc.h' header

[Michal Schorm]

            A new commit has been pushed.

            Repo   : rpms/unixODBC
            Branch : rawhide
            Commit : 7d4a39924ef30fdca6298cd0b2ec2666cceaea81
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-06-24T16:40:10+02:00
            Stats  : +1/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/unixODBC/c/7d4a39924ef30fdca6298cd0b2ec2666cceaea81?branch=rawhide

            Log:
            [bugfix] Fix multilib conflict for 'unixodbc.h' header

Upstream commit 5267d28 (between v2.3.9 and v2.3.10) added a new
'unixodbc.h' header, splitting out a subset of preprocessor constants
from 'unixodbc_conf.h' that are needed by the public 'sqltypes.h'
header.  This new file contains 'SIZEOF_LONG_INT' which is 4 on i686
and 8 on x86_64.

The spec applies '%multilib_fix_c_header' to 'unixodbc_conf.h' (which
still has its own arch-specific defines like 'SIZEOF_LONG', 'PLATFORM64'
and lib paths), but the new 'unixodbc.h' was never added.  Installing
both x86_64 and i686 'unixODBC-devel' simultaneously fails with an RPM
file-conflict error because both arches own '/usr/include/unixodbc.h'
with different content.

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/unixODBC.spec b/unixODBC.spec
index 39738ba..28b3d58 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -80,6 +80,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 %if %{undefined rhel}
 %multilib_fix_c_header --file %{_includedir}/unixODBC/unixodbc_conf.h
+%multilib_fix_c_header --file %{_includedir}/unixodbc.h
 %endif
 
 # Directory for ODBC connector/driver plugins