diff --git a/.gitignore b/.gitignore index 720c02d..cb3a8d6 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ /systemtap-4.5-0.202104140933gitad00fb87e.tar.gz /systemtap-4.5-0.202105041345git02b6be05fb76.tar.gz /systemtap-4.5.tar.gz +/systemtap-4.6-16261989g7c2751e3.tar.gz diff --git a/sources b/sources index 9e90fe5..376f74f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemtap-4.5.tar.gz) = 8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3 +SHA512 (systemtap-4.6-16261989g7c2751e3.tar.gz) = fecca5ad2bcd5625c7da9cb550e14d2c8f30e68af7b5904e350f4940614a1a5a385e2e3d1b36438581cc79bd3669d13f102502cec86da43f7b70188fbd8fdfdd diff --git a/systemtap.spec b/systemtap.spec index 7997011..7db566a 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -89,8 +89,8 @@ %define __brp_mangle_shebangs_exclude_from .stp$ Name: systemtap -Version: 4.5 -Release: 3%{?release_override}%{?dist} +Version: 4.6~pre16261989g7c2751e3 +Release: 1%{?release_override}%{?dist} # for version, see also configure.ac @@ -124,7 +124,7 @@ Release: 3%{?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}-16261989g7c2751e3.tar.gz # Build* BuildRequires: make @@ -174,7 +174,7 @@ BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf %endif %endif %if %{with_emacsvim} -BuildRequires: emacs +# no buildrequires, because just package the .el files %endif %if %{with_java} BuildRequires: java-devel @@ -196,6 +196,9 @@ BuildRequires: python2-setuptools BuildRequires: python-setuptools %endif %endif +%if %{with_python3} +BuildRequires: python3 +%endif %if %{with_python3_probes} BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -484,7 +487,7 @@ This package includes support files needed to run systemtap scripts that probe python 3 processes. %endif -%if %{with_python3} +%if %{with_python3_probes} %package exporter Summary: Systemtap-prometheus interoperation mechanism License: GPLv2+ @@ -502,7 +505,8 @@ to remote requesters on demand. Summary: Systemtap Cross-VM Instrumentation - host License: GPLv2+ URL: http://sourceware.org/systemtap/ -Requires: libvirt >= 1.0.2 +# only require libvirt-libs really +#Requires: libvirt >= 1.0.2 Requires: libxml2 %description runtime-virthost @@ -951,7 +955,7 @@ if [ "$1" -ge "1" ]; then fi exit 0 -%if %{with_python3} +%if %{with_python3_probes} %if %{with_systemd} %preun exporter if [ $1 = 0 ] ; then @@ -1192,7 +1196,7 @@ exit 0 %endif %endif -%if %{with_python3} +%if %{with_python3_probes} %files exporter %{_sysconfdir}/stap-exporter %{_sysconfdir}/sysconfig/stap-exporter @@ -1210,6 +1214,10 @@ exit 0 # PRERELEASE %changelog +* Tue Jul 13 2021 Frank Ch. Eigler - 4.6-16261989g7c2751e3 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Sat Jul 10 2021 Björn Esser - 4.5-3 - Rebuild for versioned symbols in json-c