From 71d4ccb2537f9eeb06c00313658caaf4c75d1334 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sat, 20 Oct 2012 22:46:58 -0400 Subject: [PATCH] spec: Fix multilib issue with systemtap tapsets If building on a 64bit host, rename the affected tapsets to -64.stp. This is similar to what the python package does in fedora. https://bugzilla.redhat.com/show_bug.cgi?id=831425 (cherry picked from commit 18d0632dc7c4b7c0930da32ed5a64f971c028452) Conflicts: libvirt.spec.in --- libvirt.spec.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index a7e1a00969..1a828fbfab 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -882,6 +882,13 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %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 +%endif +%endif + %clean rm -fr %{buildroot} @@ -1216,7 +1223,7 @@ 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_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp %endif