Merge branch 'master' into f14

This commit is contained in:
Josh Stone 2011-10-18 14:46:35 -07:00
commit bacde37904
1 changed files with 6 additions and 0 deletions

View File

@ -424,6 +424,7 @@ exit 0
%{_datadir}/%{name}/tapset %{_datadir}/%{name}/tapset
%if %{with_bundled_elfutils} %if %{with_bundled_elfutils}
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/lib*.so* %{_libdir}/%{name}/lib*.so*
%endif %endif
@ -436,10 +437,12 @@ exit 0
%{_bindir}/stapsh %{_bindir}/stapsh
%{_bindir}/stap-merge %{_bindir}/stap-merge
%{_bindir}/stap-report %{_bindir}/stap-report
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/stapio %{_libexecdir}/%{name}/stapio
%{_libexecdir}/%{name}/stap-env %{_libexecdir}/%{name}/stap-env
%{_libexecdir}/%{name}/stap-authorize-cert %{_libexecdir}/%{name}/stap-authorize-cert
%if %{with_crash} %if %{with_crash}
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/staplog.so* %{_libdir}/%{name}/staplog.so*
%endif %endif
%{_mandir}/man7/stappaths.7* %{_mandir}/man7/stappaths.7*
@ -449,11 +452,13 @@ exit 0
%files testsuite %files testsuite
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/testsuite %{_datadir}/%{name}/testsuite
%files server -f %{name}.lang %files server -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/stap-server %{_bindir}/stap-server
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/stap-serverd %{_libexecdir}/%{name}/stap-serverd
%{_libexecdir}/%{name}/stap-start-server %{_libexecdir}/%{name}/stap-start-server
%{_libexecdir}/%{name}/stap-stop-server %{_libexecdir}/%{name}/stap-stop-server
@ -494,6 +499,7 @@ exit 0
%files grapher %files grapher
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/stapgraph %{_bindir}/stapgraph
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*.glade %{_datadir}/%{name}/*.glade
%{_mandir}/man1/stapgraph.1* %{_mandir}/man1/stapgraph.1*
%endif %endif