[Libvirt-cim] [PATCH] Fix a problem with multi-arch

[Eduardo Lima (Etrunko)]

On 01/12/2012 04:26 AM, Daniel Veillard wrote:
> [ We carry the following patch in RHEL builds, I think it's best applied
>   upstream :-) ]
> 

Sure thing. One small doubt below.

> 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.

Can I have some of these 23 bits machine? :P

> Simply use a filename based on the expected architecture.
> 
> Signed-off-by: Daniel Veillard <veillard at 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 at 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
> 

+1. But s/23/32 before pushing.


-- 
Eduardo de Barros Lima
Software Engineer, Open Virtualization
Linux Technology Center - IBM/Brazil
eblima at br.ibm.com