Merge remote-tracking branch 'origin/master' into f21

Updates "branched" f21 to the same snapshot as rawhide, and prepares to
be rebuilt on dyninst 8.2.0.

Conflicts:
	systemtap.spec
This commit is contained in:
Josh Stone 2014-08-20 13:43:03 -07:00
commit 85599182e6
3 changed files with 29 additions and 116 deletions

3
.gitignore vendored
View File

@ -108,3 +108,6 @@ systemtap-1.3.tar.gz
/systemtap-2.6-0.175.gaa2eaf77df63.tar.gz
/systemtap-2.6-0.195.gc69af88fff8d.tar.gz
/systemtap-2.6-0.208.g035685897c43.tar.gz
/systemtap-2.6-0.240.g876abb05c522.tar.gz
/systemtap-2.6-0.299.gefa3ced615cc.tar.gz
/systemtap-2.6-0.411.gdf6c01e780a2.tar.gz

View File

@ -1 +1 @@
dfe6ec64605060ce1073c00782fc3c0c systemtap-2.6-0.208.g035685897c43.tar.gz
84c690fdf212417b8183766656e29e2a systemtap-2.6-0.411.gdf6c01e780a2.tar.gz

View File

@ -68,7 +68,7 @@
Name: systemtap
Version: 2.6
Release: 0.209.g035685897c43%{?dist}
Release: 0.411.gdf6c01e780a2%{?dist}
# for version, see also configure.ac
@ -101,7 +101,7 @@ Summary: Programmable system-wide instrumentation system
Group: Development/System
License: GPLv2+
URL: http://sourceware.org/systemtap/
Source: %{name}-%{version}-0.208.g035685897c43.tar.gz
Source: %{name}-%{version}-0.411.gdf6c01e780a2.tar.gz
# Build*
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -867,7 +867,9 @@ done
%dir %attr(0755,stap-server,stap-server) %{_localstatedir}/log/stap-server
%ghost %config(noreplace) %attr(0644,stap-server,stap-server) %{_localstatedir}/log/stap-server/log
%ghost %attr(0755,stap-server,stap-server) %{_localstatedir}/run/stap-server
%doc README README.unprivileged AUTHORS NEWS COPYING
%doc README README.unprivileged AUTHORS NEWS
%{!?_licensedir:%global license %%doc}
%license COPYING
%files devel -f systemtap.lang
@ -883,7 +885,9 @@ done
%{_mandir}/man7/error*
%{_mandir}/man7/stappaths.7*
%{_mandir}/man7/warning*
%doc README README.unprivileged AUTHORS NEWS COPYING
%doc README README.unprivileged AUTHORS NEWS
%{!?_licensedir:%global license %%doc}
%license COPYING
%if %{with_java}
%dir %{_libexecdir}/systemtap
%{_libexecdir}/systemtap/libHelperSDT_*.so
@ -924,12 +928,16 @@ done
%if %{with_dyninst}
%{_mandir}/man8/stapdyn.8*
%endif
%doc README README.security AUTHORS NEWS COPYING
%doc README README.security AUTHORS NEWS
%{!?_licensedir:%global license %%doc}
%license COPYING
%files client -f systemtap.lang
%defattr(-,root,root)
%doc README README.unprivileged AUTHORS NEWS COPYING examples
%doc README README.unprivileged AUTHORS NEWS examples
%{!?_licensedir:%global license %%doc}
%license COPYING
%if %{with_docs}
%doc docs.installed/*.pdf
%doc docs.installed/tapsets/*.html
@ -975,7 +983,9 @@ done
%{_includedir}/sys/sdt.h
%{_includedir}/sys/sdt-config.h
%{_mandir}/man1/dtrace.1*
%doc README AUTHORS NEWS COPYING
%doc README AUTHORS NEWS
%{!?_licensedir:%global license %%doc}
%license COPYING
%files testsuite
@ -1020,6 +1030,10 @@ done
# http://sourceware.org/systemtap/wiki/SystemTapReleases
%changelog
* Wed Aug 20 2014 Josh Stone <jistone@redhat.com> - 2.6-0.411.gdf6c01e780a2
- Updated snapshot in sync with rawhide
- Rebuilt for dyninst-8.2.0
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6-0.209.g035685897c43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
@ -1029,119 +1043,15 @@ done
* Mon Jul 07 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.208.g035685897c43
- Automated weekly rawhide release
* Mon Jun 23 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.195.gc69af88fff8d
- Automated weekly rawhide release
* Mon Jun 16 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.175.gaa2eaf77df63
- Automated weekly rawhide release
* Mon Jun 09 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.146.gc6c7b81a195e
- Automated weekly rawhide release
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6-0.113.g480ec383d00e
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu May 29 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.112.g480ec383d00e
- Automated weekly rawhide release
* Mon May 26 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.69.g27ce133c59da
- Automated weekly rawhide release
* Mon May 19 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.62.gb50e1cd22c61
- Automated weekly rawhide release
* Thu May 15 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.54.gb87b0305be62
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Thu May 15 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.52.ge0da6e752b05
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon May 12 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.50.g684fe5014906
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon May 05 2014 Lukas Berk <lberk@redhat.com> - 2.6-0.11.gbe329745a929
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Wed Apr 30 2014 Jonathan Lebon <jlebon@redhat.com> - 2.5-1
- Upstream release. See wiki page below for detailed notes.
http://sourceware.org/systemtap/wiki/SystemTapReleases
* Mon Apr 28 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.535.g9d4241d37eb1
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Thu Feb 13 2014 Lukas Berk <lberk@redhat.com>
- Add directory checks for runtime-java sym links
* Tue Apr 22 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.491.gd0e1cd9d2fcb
- Automated weekly rawhide release
* Mon Apr 14 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.458.g15afd83e99da
- Automated weekly rawhide release
* Sat Apr 05 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.446.ga404e997732d
- Automated weekly rawhide release
* Mon Mar 31 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.415.g7caa63eb91fd
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Mar 24 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.376.g450056a8faa6
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Mar 17 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.349.g2dd920e34796
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Mar 10 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.318.g9ee1bfe9ac1c
- Automated weekly rawhide release
* Tue Mar 04 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.296.g4f53b72c1d47
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Mar 03 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.294.g09c16468eb17
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Feb 24 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.274.gde6aa5194bf4
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Tue Feb 18 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.239.g873c6f49b639
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Feb 10 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.191.g651a87924c22
- Automated weekly rawhide release
* Mon Feb 03 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.186.gf1753911ada8
- Automated weekly rawhide release
* Mon Jan 27 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.185.g4a3f6fd34498
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Jan 20 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.151.g6ded984aa63f
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Jan 13 2014 Lukas Berk <lberk@redhat.com> - 2.5-0.123.gc60517ca2f99
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Dec 16 2013 Lukas Berk <lberk@redhat.com> - 2.5-0.87.g540c750cf41f
- Automated weekly rawhide release
* Mon Dec 09 2013 Lukas Berk <lberk@redhat.com> - 2.5-0.78.ga7dd945a54f2
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Dec 02 2013 Lukas Berk <lberk@redhat.com> - 2.5-0.70.g2200b70
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Jan 06 2014 Jonathan Lebon <jlebon@redhat.com>
- Added dracut module to initscript package
* Wed Nov 06 2013 Frank Ch. Eigler <fche@redhat.com> - 2.4-1
- Upstream release.