
[ We carry the following patch in RHEL builds, I think it's best applied upstream :-) ] The /etc/ld.so.conf.d/libvirt-cim.conf file generated conflicted between 23 bits and 64 bits arches leading to a multi-arch conflict. Simply use a filename based on the expected architecture. Signed-off-by: Daniel Veillard <veillard@redhat.com> diff --git a/libvirt-cim.spec.in b/libvirt-cim.spec.in index f3289db..d78eee7 100644 --- a/libvirt-cim.spec.in +++ b/libvirt-cim.spec.in @@ -54,7 +54,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/libxkutil.so mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d -echo %{_libdir}/cmpi > $RPM_BUILD_ROOT/etc/ld.so.conf.d/libvirt-cim.conf +echo %{_libdir}/cmpi > $RPM_BUILD_ROOT/etc/ld.so.conf.d/libvirt-cim.%{_arch}.conf mkdir -p $RPM_BUILD_ROOT@INFO_STORE@ %clean @@ -135,7 +135,7 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/libvirt-cim/cimv*-cimv2_mof %{_datadir}/libvirt-cim/*.registration %{_datadir}/libvirt-cim/cim_schema_*-MOFs.zip -%{_sysconfdir}/ld.so.conf.d/libvirt-cim.conf +%{_sysconfdir}/ld.so.conf.d/libvirt-cim.%{_arch}.conf %config(noreplace) %{_sysconfdir}/libvirt-cim.conf %changelog -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/