[libvirt] [PATCH] spec: Fix multilib issue with systemtap tapsets

[Osier Yang]

On 2012年10月21日 10:50, Cole Robinson wrote:
> If building on a 64bit host, rename the affected tapsets to<name>-64.stp.
> This is similar to what the python package does in fedora.
>
> https://bugzilla.redhat.com/show_bug.cgi?id=831425
> ---
>   libvirt.spec.in | 13 +++++++++++--
>   1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index b3b280b..ac70465 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -1384,6 +1384,15 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \
>   sed -i -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests
>   %endif
>
> +%if %{with_dtrace}
> +%ifarch %{power64} s390x x86_64 ia64 alpha sparc64
> +mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \
> +   $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp
> +mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
> +   $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp
> +%endif
> +%endif
> +
>   %clean
>   rm -fr %{buildroot}
>
> @@ -1835,8 +1844,8 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd
>   %{_libdir}/lib*.so.*
>
>   %if %{with_dtrace}
> -%{_datadir}/systemtap/tapset/libvirt_probes.stp
> -%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp
> +%{_datadir}/systemtap/tapset/libvirt_probes*.stp
> +%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
>   %{_datadir}/systemtap/tapset/libvirt_functions.stp
>   %endif
>

ACK. No need for the subdirs like x86_64, i386.