]> xenbits.xensource.com Git - libvirt.git/commitdiff
spec: Fix multilib issue with systemtap tapsets
authorCole Robinson <crobinso@redhat.com>
Sun, 21 Oct 2012 02:46:58 +0000 (22:46 -0400)
committerCole Robinson <crobinso@redhat.com>
Mon, 22 Oct 2012 20:15:12 +0000 (16:15 -0400)
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

index 511949edc4ed675c24413c53020d917899cff6e0..ebebfabdd52bd0c8dfc108b9ba498eff0ec109e5 100644 (file)
@@ -1382,6 +1382,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
 
+%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}
 
@@ -1831,8 +1840,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