Merge remote-tracking branch 'origin/master' into f23
* origin/master: (34 commits) Automated weekly systemtap rawhide release: 0.20160314git356a3b0 Automated weekly systemtap rawhide release: 0.20160314gitc857da7 Automated weekly systemtap rawhide release: 0.20160208git40ae3a7 Automated weekly systemtap rawhide release: 0.20160202git8d66e1e Automated weekly systemtap rawhide release: 0.20160201git617829c Automated weekly systemtap rawhide release: 0.20160201git6706593 Automated weekly systemtap rawhide release: 0.20160125gitc5f6801 Automated weekly systemtap rawhide release: 0.20160118gite13e9b0 Automated weekly systemtap rawhide release: 0.20160111gitf070ea0 Automated weekly systemtap rawhide release: 0.20160104git3af4429 Automated weekly systemtap rawhide release: 0.20160104git3af4429 Rebuild for Dyninst 9.1. Automated weekly systemtap rawhide release: 0.20151214git54d87c8 Automated weekly systemtap rawhide release: 0.20151207gitc788eb1 Automated weekly systemtap rawhide release: 0.20151130git5042c9a Automated weekly systemtap rawhide release: 0.20151123gita344cab Automated weekly systemtap rawhide release: 0.20151116gitcb69017 Automated weekly systemtap rawhide release: 0.20151102git7b19719 Automated weekly systemtap rawhide release: 0.20151102git6c9c5fc Automated weekly systemtap rawhide release: 0.20151102git127e4e3 ...
This commit is contained in:
Frank Ch. Eigler
commit
fe83824cb4
31
.gitignore
vendored
31
.gitignore
vendored
@ -154,3 +154,34 @@ systemtap-1.3.tar.gz
|
||||
/systemtap-2.9-0.20150707git86f726b.tar.gz
|
||||
/systemtap-2.9-0.20150713git9d0b65f.tar.gz
|
||||
/systemtap-2.9.tar.gz
|
||||
/systemtap-2.9-0.20150720gitebf15ab.tar.gz
|
||||
/systemtap-2.9-0.20150727git91fe6e2.tar.gz
|
||||
/systemtap-2.9-0.20150804git18d9c48.tar.gz
|
||||
/systemtap-2.9-0.20150810git639e610.tar.gz
|
||||
/systemtap-2.9-0.20150818git8f0e5e8.tar.gz
|
||||
/systemtap-2.9-0.20150823git62d2a73.tar.gz
|
||||
/systemtap-2.9-0.20150831gitca9905a.tar.gz
|
||||
/systemtap-2.9-0.20150914git5d9828b.tar.gz
|
||||
/systemtap-2.9-0.20150921gitd01bc76.tar.gz
|
||||
/systemtap-2.9-0.20150928git92a8fee.tar.gz
|
||||
/systemtap-3.0-0.20151019git9eef422.tar.gz
|
||||
/systemtap-3.0-0.20151026git8136768.tar.gz
|
||||
/systemtap-3.0-0.20151102git6469522.tar.gz
|
||||
/systemtap-3.0-0.20151102git127e4e3.tar.gz
|
||||
/systemtap-3.0-0.20151102git6c9c5fc.tar.gz
|
||||
/systemtap-3.0-0.20151102git7b19719.tar.gz
|
||||
/systemtap-3.0-0.20151116gitcb69017.tar.gz
|
||||
/systemtap-3.0-0.20151123gita344cab.tar.gz
|
||||
/systemtap-3.0-0.20151130git5042c9a.tar.gz
|
||||
/systemtap-3.0-0.20151207gitc788eb1.tar.gz
|
||||
/systemtap-3.0-0.20151214git54d87c8.tar.gz
|
||||
/systemtap-3.0-0.20160104git3af4429.tar.gz
|
||||
/systemtap-3.0-0.20160111gitf070ea0.tar.gz
|
||||
/systemtap-3.0-0.20160118gite13e9b0.tar.gz
|
||||
/systemtap-3.0-0.20160125gitc5f6801.tar.gz
|
||||
/systemtap-3.0-0.20160201git6706593.tar.gz
|
||||
/systemtap-3.0-0.20160201git617829c.tar.gz
|
||||
/systemtap-3.0-0.20160202git8d66e1e.tar.gz
|
||||
/systemtap-3.0-0.20160208git40ae3a7.tar.gz
|
||||
/systemtap-3.0-0.20160314gitc857da7.tar.gz
|
||||
/systemtap-3.0-0.20160314git356a3b0.tar.gz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
2f3c183966c82ec9d70c1de286b545fc systemtap-2.9.tar.gz
|
||||
139c3b8d5e51dffe87357d062ff5a898 systemtap-3.0-0.20160314git356a3b0.tar.gz
|
||||
|
||||
179
systemtap.spec
179
systemtap.spec
@ -1,5 +1,7 @@
|
||||
%{!?with_sqlite: %global with_sqlite 1}
|
||||
%{!?with_docs: %global with_docs 1}
|
||||
%{!?with_htmldocs: %global with_htmldocs 0}
|
||||
%{!?with_monitor: %global with_monitor 1}
|
||||
# crash is not available
|
||||
%ifarch ppc ppc64 %{sparc} aarch64 ppc64le
|
||||
%{!?with_crash: %global with_crash 0}
|
||||
@ -57,8 +59,8 @@
|
||||
%define dracutstap %{_prefix}/lib/dracut/modules.d/99stap
|
||||
|
||||
Name: systemtap
|
||||
Version: 2.9
|
||||
Release: 1%{?dist}
|
||||
Version: 3.0
|
||||
Release: 0.20160314git356a3b0%{?dist}
|
||||
# for version, see also configure.ac
|
||||
|
||||
|
||||
@ -91,7 +93,7 @@ Summary: Programmable system-wide instrumentation system
|
||||
Group: Development/System
|
||||
License: GPLv2+
|
||||
URL: http://sourceware.org/systemtap/
|
||||
Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
|
||||
Source: %{name}-%{version}-0.20160314git356a3b0.tar.gz
|
||||
|
||||
# Build*
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -105,6 +107,9 @@ BuildRequires: libselinux-devel
|
||||
%if %{with_sqlite}
|
||||
BuildRequires: sqlite-devel
|
||||
%endif
|
||||
%if %{with_monitor}
|
||||
BuildRequires: json-c-devel ncurses-devel
|
||||
%endif
|
||||
# Needed for libstd++ < 4.0, without <tr1/memory>
|
||||
%if %{with_boost}
|
||||
BuildRequires: boost-devel
|
||||
@ -124,15 +129,20 @@ BuildRequires: m4
|
||||
BuildRequires: elfutils-devel >= %{elfutils_version}
|
||||
%endif
|
||||
%if %{with_docs}
|
||||
BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
|
||||
BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf
|
||||
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
|
||||
BuildRequires: tex(fullpage.sty) tex(fancybox.sty) tex(bchr7t.tfm)
|
||||
BuildRequires: tex(fullpage.sty) tex(fancybox.sty) tex(bchr7t.tfm) tex(graphicx.sty)
|
||||
%endif
|
||||
# For the html.sty mentioned in the .tex files, even though latex2html is
|
||||
# not run during the build, only during manual scripts/update-docs runs:
|
||||
BuildRequires: latex2html
|
||||
%if %{with_htmldocs}
|
||||
# On F10, xmlto's pdf support was broken off into a sub-package,
|
||||
# called 'xmlto-tex'. To avoid a specific F10 BuildReq, we'll do a
|
||||
# file-based buildreq on '/usr/share/xmlto/format/fo/pdf'.
|
||||
BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
|
||||
%endif
|
||||
%endif
|
||||
%if %{with_emacsvim}
|
||||
BuildRequires: emacs
|
||||
%endif
|
||||
@ -143,6 +153,10 @@ BuildRequires: jpackage-utils java-devel
|
||||
BuildRequires: libvirt-devel >= 1.0.2
|
||||
BuildRequires: libxml2-devel
|
||||
%endif
|
||||
BuildRequires: readline-devel
|
||||
%if 0%{?rhel} <= 5
|
||||
BuildRequires: ncurses-devel
|
||||
%endif
|
||||
|
||||
# Install requirements
|
||||
Requires: systemtap-client = %{version}-%{release}
|
||||
@ -315,6 +329,10 @@ Requires: /usr/lib/libc.so
|
||||
%if 0%{?fedora} >= 18
|
||||
Requires: stress
|
||||
%endif
|
||||
# The following "meta" files for the systemtap examples run "perf":
|
||||
# testsuite/systemtap.examples/hw_watch_addr.meta
|
||||
# testsuite/systemtap.examples/memory/hw_watch_sym.meta
|
||||
Requires: perf
|
||||
|
||||
%description testsuite
|
||||
This package includes the dejagnu-based systemtap stress self-testing
|
||||
@ -436,7 +454,11 @@ cd ..
|
||||
%endif
|
||||
|
||||
%if %{with_docs}
|
||||
%global docs_config --enable-docs
|
||||
%if %{with_htmldocs}
|
||||
%global docs_config --enable-docs --enable-htmldocs
|
||||
%else
|
||||
%global docs_config --enable-docs --disable-htmldocs
|
||||
%endif
|
||||
%else
|
||||
%global docs_config --disable-docs
|
||||
%endif
|
||||
@ -464,7 +486,7 @@ cd ..
|
||||
%if %{with_dracut}
|
||||
%global dracut_config --with-dracutstap=%{dracutstap}
|
||||
%else
|
||||
%global dracut_config
|
||||
%global dracut_config %{nil}
|
||||
%endif
|
||||
|
||||
%if %{with_python3}
|
||||
@ -472,6 +494,8 @@ cd ..
|
||||
%else
|
||||
%global python3_config --without-python3
|
||||
%endif
|
||||
# We don't ship compileworthy python code, just oddball samples
|
||||
%global py_auto_byte_compile 0
|
||||
|
||||
%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}"
|
||||
make %{?_smp_mflags}
|
||||
@ -484,6 +508,11 @@ make %{?_smp_mflags}
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
%find_lang %{name}
|
||||
for dir in $(ls -1d $RPM_BUILD_ROOT%{_mandir}/{??,??_??}) ; do
|
||||
dir=$(echo $dir | sed -e "s|^$RPM_BUILD_ROOT||")
|
||||
lang=$(basename $dir)
|
||||
echo "%%lang($lang) $dir/man*/*" >> %{name}.lang
|
||||
done
|
||||
|
||||
# We want the examples in the special doc dir, not the build install dir.
|
||||
# We build it in place and then move it away so it doesn't get installed
|
||||
@ -491,8 +520,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
|
||||
# %doc directive.
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples
|
||||
|
||||
# Fix paths in the example & testsuite scripts
|
||||
find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
|
||||
# Fix paths in the example scripts.
|
||||
find examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
|
||||
|
||||
# To make rpmlint happy, remove any .gitignore files in the testsuite.
|
||||
find testsuite -type f -name '.gitignore' -print0 | xargs -0 rm -f
|
||||
@ -516,9 +545,11 @@ cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap
|
||||
# %doc directive.
|
||||
mkdir docs.installed
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/
|
||||
%if %{with_htmldocs}
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/tapsets docs.installed/
|
||||
mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/SystemTap_Beginners_Guide docs.installed/
|
||||
%endif
|
||||
%endif
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/stap-server
|
||||
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/stap-server
|
||||
@ -929,9 +960,11 @@ done
|
||||
%license COPYING
|
||||
%if %{with_docs}
|
||||
%doc docs.installed/*.pdf
|
||||
%if %{with_htmldocs}
|
||||
%doc docs.installed/tapsets/*.html
|
||||
%doc docs.installed/SystemTap_Beginners_Guide
|
||||
%endif
|
||||
%endif
|
||||
%{_bindir}/stap
|
||||
%{_bindir}/stap-prep
|
||||
%{_bindir}/stap-report
|
||||
@ -1018,8 +1051,132 @@ done
|
||||
# http://sourceware.org/systemtap/wiki/SystemTapReleases
|
||||
|
||||
%changelog
|
||||
* Thu Oct 08 2015 Frank Ch. Eigler <fche@redhat.com> - 2.9-1
|
||||
- Upstream release.
|
||||
* Mon Mar 14 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160314git356a3b0
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Mar 14 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160314gitc857da7
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Feb 08 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160208git40ae3a7
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Tue Feb 02 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160202git8d66e1e
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Feb 01 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160201git617829c
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Feb 01 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160201git6706593
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Jan 25 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160125gitc5f6801
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Jan 18 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160118gite13e9b0
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Jan 11 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160111gitf070ea0
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Jan 04 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160104git3af4429
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Jan 04 2016 Lukas Berk <lberk@redhat.com> - 3.0-0.20160104git3af4429
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Fri Dec 18 2015 Josh Stone <jistone@redhat.com> - 3.0-0.20151214git54d87c8.1
|
||||
- Rebuild for Dyninst 9.1.
|
||||
|
||||
* Mon Dec 14 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151214git54d87c8
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Dec 07 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151207gitc788eb1
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Nov 30 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151130git5042c9a
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Nov 23 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151123gita344cab
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Nov 16 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151116gitcb69017
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Nov 02 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151102git7b19719
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Nov 02 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151102git6c9c5fc
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Nov 02 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151102git127e4e3
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Nov 02 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151102git6469522
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Oct 26 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151026git8136768
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Oct 19 2015 Lukas Berk <lberk@redhat.com> - 3.0-0.20151019git9eef422
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Sep 28 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150928git92a8fee
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Sep 21 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150921gitd01bc76
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Sep 14 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150914git5d9828b
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Fri Sep 04 2015 Josh Stone <jistone@redhat.com> - 2.9-0.20150831gitca9905a.1
|
||||
- Rebuild for Dyninst 9.0.
|
||||
|
||||
* Mon Aug 31 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150831gitca9905a
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Sun Aug 23 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150823git62d2a73
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Tue Aug 18 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150818git8f0e5e8
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Aug 10 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150810git639e610
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Tue Aug 04 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150804git18d9c48
|
||||
- Automated weekly rawhide release
|
||||
|
||||
* Mon Jul 27 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150727git91fe6e2
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Jul 20 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150720gitebf15ab
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Mon Jul 13 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150713git9d0b65f
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Tue Jul 07 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150707git86f726b
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Tue Jul 07 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150707git320e1ec
|
||||
- Automated weekly rawhide release
|
||||
- Applied spec changes from upstream git
|
||||
|
||||
* Wed Jun 17 2015 Abegail Jakop <ajakop@redhat.com> - 2.8-1
|
||||
- Upstream release.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user