From 2ce9d21e23b16063428ed2ef09ef8e4b9b37872d Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Tue, 4 Sep 2018 17:18:09 +0200
Subject: [PATCH] Fix parallel installability of x86_64 and i686 devel packages

---
 mariadb.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/mariadb.spec b/mariadb.spec
index 150de07..03f5b19 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -143,7 +143,7 @@
 
 Name:             mariadb
 Version:          10.3.9
-Release:          1%{?with_debug:.debug}%{?dist}
+Release:          2%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          MariaDB: a very fast and robust SQL database server
@@ -834,10 +834,10 @@ make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp
 %install
 make DESTDIR=%{buildroot} install
 
-# multilib header support
-#for header in mysql/my_config.h mysql/private/config.h; do
-#%multilib_fix_c_header --file %{_includedir}/$header
-#done
+# multilib header support #1625157
+for header in mysql/server/my_config.h mysql/server/private/config.h; do
+%multilib_fix_c_header --file %{_includedir}/$header
+done
 
 ln -s mysql_config.1.gz %{buildroot}%{_mandir}/man1/mariadb_config.1.gz
 
@@ -1547,6 +1547,9 @@ fi
 %endif
 
 %changelog
+* Tue Sep 04 2018 Michal Schorm <mschorm@redhat.com> - 3:10.3.9-2
+- Fix parallel installability of x86_64 and i686 devel packages
+
 * Mon Aug 20 2018 Michal Schorm <mschorm@redhat.com> - 3:10.3.9-1
 - Rebase to 10.3.9