[opal] Avoid multilib conflict

[Matthias Clasen]

commit 638eb5784cfa356ec24b71f914b80e3cd9189618
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Oct 8 18:24:10 2013 -0400

    Avoid multilib conflict

 opal.spec |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/opal.spec b/opal.spec
index 037313b..8245f8c 100644
--- a/opal.spec
+++ b/opal.spec
@@ -1,7 +1,7 @@
 Name:		opal
 Summary:	Open Phone Abstraction Library
 Version:	3.10.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 URL:		http://www.opalvoip.org/
 License:	MPLv1.0
 Group:		System Environment/Libraries
@@ -56,6 +56,26 @@ make DESTDIR=%{buildroot} install
 rm -f %{buildroot}/%{_datadir}/opal/opal_inc.mak
 rm -f %{buildroot}/%{_libdir}/libopal_s.a
 
+# avoid multilib conflict
+mv %{buildroot}/%{_includedir}/opal/opal/buildopts.h \
+   %{buildroot}/%{_includedir}/opal/opal/buildopts-%{__isa_bits}.h
+cat >%{buildroot}/%{_includedir}/opal/opal/buildopts.h <<EOF
+#ifndef OPAL_BUILDOPTS_H_MULTILIB
+#define OPAL_BUILDOPTS_H_MULTILIB
+
+#include <bits/wordsize.h>
+
+#if  __WORDSIZE == 32
+# include "buildopts-32.h"
+#elif __WORDSIZE == 64
+# include "buildopts-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+EOF
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -73,6 +93,9 @@ rm -f %{buildroot}/%{_libdir}/libopal_s.a
 %{_libdir}/pkgconfig/opal.pc
 
 %changelog
+* Tue Oct  8 2013 Matthias Clasen <mclasen at redhat.com> - 3.10.10-3
+- Avoid multilib conflict
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.10.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild