From eab6028826fae85c77bc941362d9f028d17e36b2 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Jul 13 2015 12:42:51 +0000 Subject: Automated weekly systemtap rawhide release: 0.20150713git9d0b65f --- diff --git a/.gitignore b/.gitignore index 06ba135..465b487 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,4 @@ systemtap-1.3.tar.gz /systemtap-2.8.tar.gz /systemtap-2.9-0.20150707git320e1ec.tar.gz /systemtap-2.9-0.20150707git86f726b.tar.gz +/systemtap-2.9-0.20150713git9d0b65f.tar.gz diff --git a/sources b/sources index 6991306..2625f97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1054989f3ac7642db1fe945fdc0f26e9 systemtap-2.9-0.20150707git86f726b.tar.gz +30a7ad17d25adbc06af6c8f873ce2813 systemtap-2.9-0.20150713git9d0b65f.tar.gz diff --git a/systemtap.spec b/systemtap.spec index 49a503b..61738cd 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -30,6 +30,7 @@ %{!?with_openssl: %global with_openssl 0} %endif %{!?with_pyparsing: %global with_pyparsing 0%{?fedora} >= 18 || 0%{?rhel} >= 7} +%{!?with_python3: %global with_python3 0%{?fedora} >= 23} %ifarch ppc64le aarch64 %global with_virthost 0 @@ -57,7 +58,7 @@ Name: systemtap Version: 2.9 -Release: 0.20150707git86f726b%{?dist} +Release: 0.20150713git9d0b65f%{?dist} # for version, see also configure.ac @@ -90,7 +91,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20150707git86f726b.tar.gz +Source: %{name}-%{version}-0.20150713git9d0b65f.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -260,8 +261,12 @@ Group: Development/System License: GPLv2+ and Public Domain URL: http://sourceware.org/systemtap/ %if %{with_pyparsing} +%if %{with_python3} +Requires: python3-pyparsing +%else Requires: pyparsing %endif +%endif %description sdt-devel This package includes the header file used for static @@ -287,8 +292,12 @@ Requires: strace # 'nmap-ncat'). So, we'll do a file-based require. Requires: /usr/bin/nc %ifnarch ia64 ppc64le aarch64 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 +# no prelink +%else Requires: prelink %endif +%endif # testsuite/systemtap.server/client.exp needs avahi Requires: avahi %if %{with_crash} @@ -458,7 +467,13 @@ cd .. %global dracut_config %endif -%configure %{?elfutils_config} %{dyninst_config} %{sqlite_config} %{crash_config} %{docs_config} %{pie_config} %{rpm_config} %{java_config} %{virt_config} %{dracut_config} --disable-silent-rules --with-extra-version="rpm %{version}-%{release}" +%if %{with_python3} +%global python3_config --with-python3 +%else +%global python3_config --without-python3 +%endif + +%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} %if %{with_emacsvim} @@ -1015,6 +1030,10 @@ done # http://sourceware.org/systemtap/wiki/SystemTapReleases %changelog +* Mon Jul 13 2015 Lukas Berk - 2.9-0.20150713git9d0b65f +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Tue Jul 07 2015 Lukas Berk - 2.9-0.20150707git86f726b - Automated weekly rawhide release - Applied spec changes from upstream git