diff --git a/.gitignore b/.gitignore index 5aa63e1..cc9943a 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /systemtap-4.2-0.20190807gitebfc300ec2ad.tar.gz /systemtap-4.2-0.20190827git8ffab23ff.tar.gz /systemtap-4.2.tar.gz +/systemtap-4.3-0.20200112gitb1e6a6645bba.tar.gz diff --git a/sources b/sources index 5c23613..35ad3c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.2.tar.gz) = 50d426e8c3d976fd635f6867fb4202832be455d869178a384159d1b2cd2a25642b07da2bd3184081b13bfb95df48a97f430b06713eaee0d0f67e27f43266cfd6 +SHA512 (systemtap-4.3-0.20200112gitb1e6a6645bba.tar.gz) = d8419a1987d8b9063f508641ec35201a8ddd1779a2305aef1e9e80a7c51c9ee375e1dfb1505ab909227addce76ea2c8db89247c724e369b66e534e8f77285501 diff --git a/systemtap.spec b/systemtap.spec index 40dc9ae..df72c19 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -10,7 +10,6 @@ %{!?with_crash: %global with_crash 1} %endif %{!?with_rpm: %global with_rpm 1} -%{!?with_bundled_elfutils: %global with_bundled_elfutils 0} %{!?elfutils_version: %global elfutils_version 0.142} %{!?pie_supported: %global pie_supported 1} %{!?with_boost: %global with_boost 0} @@ -87,8 +86,8 @@ %define __brp_mangle_shebangs_exclude_from .stp$ Name: systemtap -Version: 4.2 -Release: 1%{?release_override}%{?dist} +Version: 4.3 +Release: 0.20200112gitb1e6a6645bba%{?dist} # for version, see also configure.ac @@ -122,7 +121,7 @@ Release: 1%{?release_override}%{?dist} Summary: Programmable system-wide instrumentation system License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz +Source: %{name}-%{version}-0.20200112gitb1e6a6645bba.tar.gz # Build* BuildRequires: gcc-c++ @@ -154,14 +153,7 @@ BuildRequires: crash-devel zlib-devel %if %{with_rpm} BuildRequires: rpm-devel %endif -%if %{with_bundled_elfutils} -# Source1: elfutils-%{elfutils_version}.tar.gz -Patch1: elfutils-portability.patch -BuildRequires: m4 -%global setup_elfutils -a1 -%else BuildRequires: elfutils-devel >= %{elfutils_version} -%endif %if %{with_docs} BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 @@ -514,35 +506,10 @@ systemtap-runtime-virthost machine to execute systemtap scripts. # ------------------------------------------------------------------------ %prep -%setup -q %{?setup_elfutils} - -%if %{with_bundled_elfutils} -cd elfutils-%{elfutils_version} -%patch1 -p1 -sleep 1 -find . \( -name Makefile.in -o -name aclocal.m4 \) -print | xargs touch -sleep 1 -find . \( -name configure -o -name config.h.in \) -print | xargs touch -cd .. -%endif +%setup -q %build -%if %{with_bundled_elfutils} -# Build our own copy of elfutils. -%global elfutils_config --with-elfutils=elfutils-%{elfutils_version} - -# We have to prevent the standard dependency generation from identifying -# our private elfutils libraries in our provides and requires. -%global _use_internal_dependency_generator 0 -%global filter_eulibs() /bin/sh -c "%{1} | sed '/libelf/d;/libdw/d;/libebl/d'" -%global __find_provides %{filter_eulibs /usr/lib/rpm/find-provides} -%global __find_requires %{filter_eulibs /usr/lib/rpm/find-requires} - -# This will be needed for running stap when not installed, for the test suite. -%global elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils -%endif - # Enable/disable the dyninst pure-userspace backend %if %{with_dyninst} %global dyninst_config --with-dyninst @@ -638,12 +605,9 @@ cd .. # 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} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" +%configure %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} %{python3_config} %{python2_probes_config} %{python3_probes_config} %{httpd_config} %{bpf_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" make %{?_smp_mflags} -%if %{with_emacsvim} -%{_emacs_bytecompile} emacs/systemtap-mode.el -%endif %install make DESTDIR=$RPM_BUILD_ROOT install @@ -1090,10 +1054,6 @@ done %dir %{_libexecdir}/systemtap %{_libexecdir}/systemtap/libHelperSDT_*.so %endif -%if %{with_bundled_elfutils} -%dir %{_libdir}/systemtap -%{_libdir}/systemtap/lib*.so* -%endif %if %{with_emacsvim} %{_emacs_sitelispdir}/*.el* %{_emacs_sitestartdir}/systemtap-init.el @@ -1266,15 +1226,13 @@ done # PRERELEASE %changelog +* Sun Jan 12 2020 Frank Ch. Eigler - 4.3-0.20200112gitb1e6a6645bba +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Mon Nov 18 2019 Sagar Patel - 4.2-1 - Upstream release. -* Thu Oct 03 2019 Miro HronĨok - 4.2-0.20190828git8ffab23ff -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Tue May 07 2019 Serguei Makarov - 4.1-1 -- Upstream release. - * Tue May 07 2019 Serguei Makarov - 4.1-1 - Upstream release.