[xerces-c] Removed the multilib conflict workaround

[Kalev Lember]

commit 6d6efcb12fa0bb9e142ab544ad6a59b8c8b9f2b2
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Thu Mar 10 10:58:24 2011 +0200

    Removed the multilib conflict workaround
    
    Xerces_autoconf_config.hpp no longer contains the conflicting
    XERCES_SIZEOF_LONG define.

 xerces-c.spec |   23 ++---------------------
 1 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/xerces-c.spec b/xerces-c.spec
index 6c85623..f3bc09f 100644
--- a/xerces-c.spec
+++ b/xerces-c.spec
@@ -74,27 +74,6 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}
 # Remove .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# Fix multilib conflict
-mv $RPM_BUILD_ROOT%{_includedir}/xercesc/util/Xerces_autoconf_config.hpp \
-   $RPM_BUILD_ROOT%{_includedir}/xercesc/util/Xerces_autoconf_config-%{__isa_bits}.hpp
-
-cat >$RPM_BUILD_ROOT%{_includedir}/xercesc/util/Xerces_autoconf_config.hpp <<EOF
-#ifndef XERCES_C_MULTILIB
-#define XERCES_C_MULTILIB
-
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-# include "Xerces_autoconf_config-32.hpp"
-#elif __WORDSIZE == 64
-# include "Xerces_autoconf_config-64.hpp"
-#else
-# error "unexpected value for __WORDSIZE macro"
-#endif
-
-#endif 
-EOF
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -121,6 +100,8 @@ rm -rf $RPM_BUILD_ROOT
 - Update to 3.1.1
 - Dropped CVE-2009-1885 patch.
 - Use dos2unix -k instead of unrecognized option -U
+- Removed the multilib conflict workaround as Xerces_autoconf_config.hpp
+  no longer contains the conflicting XERCES_SIZEOF_LONG define.
 
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild