[qt5-qtbase] qt5-base-devel.x86_64 qt5-base-devel.i686 file conflict qconfig.h (#1036956)

[Rex Dieter]

commit 4b18140d235796a3584ee0dae6cb4e9e291a49d2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 6 10:31:38 2013 -0600

    qt5-base-devel.x86_64 qt5-base-devel.i686 file conflict qconfig.h (#1036956)

 qconfig-multilib.h |   20 ++++++++++++++++++++
 qt5-qtbase.spec    |   17 ++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/qconfig-multilib.h b/qconfig-multilib.h
new file mode 100644
index 0000000..7ed351b
--- /dev/null
+++ b/qconfig-multilib.h
@@ -0,0 +1,20 @@
+/* qconfig.h */
+/* This file is here to prevent a file conflict on multiarch systems.  A
+ * conflict will occur because qconfig.h has arch-specific definitions.
+ *
+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
+
+#ifndef QCONFIG_MULTILIB_H
+#define QCONFIG_MULTILIB_H
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "QtCore/qconfig-32.h"
+#elif __WORDSIZE == 64
+#include "QtCore/qconfig-64.h"
+#else
+#error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 6497249..e93ee00 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -26,7 +26,7 @@
 Summary: Qt5 - QtBase components
 Name:    qt5-qtbase
 Version: 5.2.0
-Release: 0.11.%{pre}%{?dist}
+Release: 0.12.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -41,6 +41,10 @@ Source0: http://download.qt-project.org/official_releases/qt/5.2/%{version}/subm
 %endif
 %endif
 
+# header file to workaround multilib issue
+# https://bugzilla.redhat.com/show_bug.cgi?id=1036956
+Source5: qconfig-multilib.h
+
 # help build on some lowmem archs, e.g. drop hard-coded -O3 optimization on some files
 Patch1: qtbase-opensource-src-5.0.2-lowmem.patch
 
@@ -372,6 +376,14 @@ for i in * ; do
 done
 popd
 
+%ifarch %{multilib_archs}
+# multilib: qconfig.h
+  mv %{buildroot}%{_qt5_headerdir}/Qt/qconfig.h %{buildroot}%{_qt5_headerdir}/QtCore/qconfig-%{__isa_bits}.h
+  install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt5_headerdir}/QtCore/qconfig-multilib.h
+  ln -sf qconfig-multilib.h %{buildroot}%{_qt5_headerdir}/QtCore/qconfig.h
+  ln -sf ../QtCore/qconfig.h %{buildroot}%{_qt5_headerdir}/Qt/qconfig.h
+%endif
+
 # qtchooser conf
 %if 0%{?qtchooser}
   mkdir -p %{buildroot}%{_sysconfdir}/xdg/qtchooser
@@ -611,6 +623,9 @@ popd
 
 
 %changelog
+* Fri Dec 06 2013 Rex Dieter <rdieter at fedoraproject.org> 5.2.0-0.12.rc1
+- qt5-base-devel.x86_64 qt5-base-devel.i686 file conflict qconfig.h (#1036956)
+
 * Thu Dec 05 2013 Rex Dieter <rdieter at fedoraproject.org> - 5.2.0-0.11.rc1
 - needs a minimum version on sqlite build dependency (#1038617)
 - fix build when doc macro not defined