rpms/xerces-c/devel xerces-c.spec,1.29,1.30

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/xerces-c/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13597

Modified Files:
	xerces-c.spec 
Log Message:
Fix multilib conflict caused by Xerces_autoconf_config.hpp (#595923)



Index: xerces-c.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xerces-c/devel/xerces-c.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xerces-c.spec	14 May 2010 14:52:06 -0000	1.29
+++ xerces-c.spec	26 May 2010 13:22:01 -0000	1.30
@@ -1,7 +1,7 @@
 Summary:	Validating XML Parser
 Name:		xerces-c
 Version:	3.0.1
-Release:	18%{?dist}
+Release:	19%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Libraries
 URL:		http://xml.apache.org/xerces-c/
@@ -74,6 +74,27 @@ 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
 
@@ -96,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README LICENSE NOTICE CREDITS doc _docs/*
 
 %changelog
+* Wed May 26 2010 Kalev Lember <kalev at smartlink.ee> 3.0.1-19
+- Fix multilib conflict caused by Xerces_autoconf_config.hpp (#595923)
+
 * Fri May 14 2010 Kalev Lember <kalev at smartlink.ee> 3.0.1-18
 - Build -doc subpackage as noarch