fix multilib conflicts, don't ship .a

libart-multilib.patch

@@ -0,0 +1,33 @@
+--- libart_lgpl-2.3.17/libart-config.in.multilib	2006-07-27 18:02:06.000000000 -0400
++++ libart_lgpl-2.3.17/libart-config.in	2006-07-27 18:02:11.000000000 -0400
+@@ -1,7 +1,9 @@
+ #!/bin/sh
+ 
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
++includedir=`pkg-config --variable includedir libart-2.0`
++libdir=`pkg-config --variable libdir libart-2.0`
++prefix=`pkg-config --variable prefix libart-2.0`
++exec_prefix=`pkg-config --variable exec_prefix libart-2.0`
+ exec_prefix_set=no
+ 
+ usage="\
+@@ -36,15 +38,13 @@
+       echo $exec_prefix
+       ;;
+     --version)
+-      echo @LIBART_VERSION@
++      pkg-config --modversion libart-2.0
+       ;;
+     --cflags)
+-      includes=-I@includedir@/libart-2.0
+-      echo $includes
++      echo -I$includedir/libart-2.0
+       ;;
+     --libs)
+-      libdirs=-L@libdir@
+-      echo $libdirs -lart_lgpl_2 -lm
++      echo -L$libdir -lart_lgpl_2 -lm
+       ;;
+     *)
+       echo "${usage}" 1>&2

libart_lgpl.spec

@@ -1,9 +1,10 @@
 Summary: Library of graphics routines used by libgnomecanvas
 Name: libart_lgpl
 Version: 2.3.17
-Release: 2.2.2
+Release: 3
 URL: http://www.gnome.org/
 Source0: %{name}-%{version}.tar.bz2
+Patch0: libart-multilib.patch
 License: LGPL
 Group: System Environment/Libraries 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -14,7 +15,7 @@ Graphics routines used by the GnomeCanvas widget and some other
 applications. libart renders vector paths and the like.
 
 %package devel
-Summary: Libraries and headers for libart_lgpl.
+Summary: Libraries and headers for libart_lgpl
 Group: Development/Libraries
 Requires: %name = %{version}
 Conflicts: gnome-libs-devel < 1:1.4.1.2
@@ -26,6 +27,7 @@ applications. libart renders vector paths and the like.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
 
 %build
 %configure
@@ -35,8 +37,36 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 %makeinstall
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# fix multilib issues
+%ifarch x86_64 s390x ia64 ppc64
+%define wordsize 64
+%else
+%define wordsize 32
+%endif
+
+mv $RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config.h \
+   $RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config.h-%{wordsize}.h
+
+cat >$RPM_BUILD_ROOT%{_includedir}/libart-2.0/libart_lgpl/art_config.h <<EOF
+#ifndef LIBART_MULTILIB
+#define LIBART_MULTILIB
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "art_config-32.h"
+#elif __WORDSIZE == 64
+# include "art_config-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif 
+EOF
+
 %clean
 rm -rf %{buildroot}
 
@@ -54,13 +84,16 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root)
 
-%{_libdir}/lib*.a
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 %{_bindir}/libart2-config
 %{_includedir}/*
 
 %changelog
+* Thu Jul 27 2006 Matthias Clasen <mclasen@redhat.com> - 2.3.17-3
+- Fix multilib conflicts
+- Don't ship static libraries
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.3.17-2.2.2
 - rebuild