From a05400377c492b457b1f585e7095339d86be55a3 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 24 May 2006 20:17:10 +0000
Subject: [PATCH] fix multilib

---
 ORBit2.spec | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/ORBit2.spec b/ORBit2.spec
index 2b29db5..65bb1a0 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -65,10 +65,36 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/ORBit-2.0/*.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.*a
 
+# fix multilib issues
+%ifarch x86_64 s390x ia64 ppc64
+%define wordsize 64
+%else
+%define wordsize 32
+%endif
+
+mv $RPM_BUILD_ROOT%{_includedir}/orbit-2.0/orbit/orbit-config.h \
+   $RPM_BUILD_ROOT%{_includedir}/orbit-2.0/orbit/orbit-config-%{wordsize}.h
+
+cat > $RPM_BUILD_ROOT%{_includedir}/orbit-2.0/orbit-config.h <EOF
+#ifndef ORBIT_MULTILIB
+#define ORBIT_MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "orbit-config-32.h"
+#elif __WORDSIZE == 64
+# include "orbit-config-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif 
+EOF
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
-
 %clean
 rm -rf %{buildroot}
 
@@ -96,6 +122,7 @@ rm -rf %{buildroot}
 %changelog
 * Wed May 24 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.0-2
 - Don't rebuild api docs
+- Fix multilib conflicts
 
 * Tue Mar 14 2006 Ray Strode <rstrode@redhat.com> - 2.14.1-1
 - Update to 2.14.1