From 8a23a84da195ff7c544074152846b8b96d1265d5 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Tue, 7 Jul 2015 13:22:49 -0400 Subject: [PATCH 1/5] Automated weekly systemtap rawhide release: 0.20150707git320e1ec --- .gitignore | 1 + sources | 2 +- systemtap.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5d90044..f3a93ef 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,4 @@ systemtap-1.3.tar.gz /systemtap-2.8-0.20150525gita80691d.tar.gz /systemtap-2.8-0.20150601git1eed3df.tar.gz /systemtap-2.8.tar.gz +/systemtap-2.9-0.20150707git320e1ec.tar.gz diff --git a/sources b/sources index 7dd1b74..83e3c8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cb77a01b1522ecdb83df1c878160bc1 systemtap-2.8.tar.gz +4e2570e0f4e98c003d5bea54e60bb8d4 systemtap-2.9-0.20150707git320e1ec.tar.gz diff --git a/systemtap.spec b/systemtap.spec index 1978b9b..f043a2e 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -56,8 +56,8 @@ %define dracutstap %{_prefix}/lib/dracut/modules.d/99stap Name: systemtap -Version: 2.8 -Release: 1%{?dist} +Version: 2.9 +Release: 0.20150707git320e1ec%{?dist} # for version, see also configure.ac @@ -90,7 +90,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.20150707git320e1ec.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -1015,6 +1015,10 @@ done # http://sourceware.org/systemtap/wiki/SystemTapReleases %changelog +* Tue Jul 07 2015 Lukas Berk - 2.9-0.20150707git320e1ec +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Wed Jun 17 2015 Abegail Jakop - 2.8-1 - Upstream release. From 984a376afe952d23b95180daa37053580251d779 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Tue, 7 Jul 2015 15:46:12 -0400 Subject: [PATCH 2/5] Automated weekly systemtap rawhide release: 0.20150707git86f726b --- .gitignore | 1 + sources | 2 +- systemtap.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f3a93ef..06ba135 100644 --- a/.gitignore +++ b/.gitignore @@ -151,3 +151,4 @@ systemtap-1.3.tar.gz /systemtap-2.8-0.20150601git1eed3df.tar.gz /systemtap-2.8.tar.gz /systemtap-2.9-0.20150707git320e1ec.tar.gz +/systemtap-2.9-0.20150707git86f726b.tar.gz diff --git a/sources b/sources index 83e3c8c..6991306 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e2570e0f4e98c003d5bea54e60bb8d4 systemtap-2.9-0.20150707git320e1ec.tar.gz +1054989f3ac7642db1fe945fdc0f26e9 systemtap-2.9-0.20150707git86f726b.tar.gz diff --git a/systemtap.spec b/systemtap.spec index f043a2e..49a503b 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -57,7 +57,7 @@ Name: systemtap Version: 2.9 -Release: 0.20150707git320e1ec%{?dist} +Release: 0.20150707git86f726b%{?dist} # for version, see also configure.ac @@ -90,7 +90,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20150707git320e1ec.tar.gz +Source: %{name}-%{version}-0.20150707git86f726b.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -1015,6 +1015,10 @@ done # http://sourceware.org/systemtap/wiki/SystemTapReleases %changelog +* Tue Jul 07 2015 Lukas Berk - 2.9-0.20150707git86f726b +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Tue Jul 07 2015 Lukas Berk - 2.9-0.20150707git320e1ec - Automated weekly rawhide release - Applied spec changes from upstream git From eab6028826fae85c77bc941362d9f028d17e36b2 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Mon, 13 Jul 2015 08:42:51 -0400 Subject: [PATCH 3/5] Automated weekly systemtap rawhide release: 0.20150713git9d0b65f --- .gitignore | 1 + sources | 2 +- systemtap.spec | 25 ++++++++++++++++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) 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 From 8e95a285378a49d4bbcf87a28906b614acfc4668 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 5 Sep 2015 14:14:43 +0200 Subject: [PATCH 4/5] Rebuilt for librpm soname bump --- systemtap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/systemtap.spec b/systemtap.spec index 61738cd..159808f 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -58,7 +58,7 @@ Name: systemtap Version: 2.9 -Release: 0.20150713git9d0b65f%{?dist} +Release: 0.20150713git9d0b65f%{?dist}.1 # for version, see also configure.ac @@ -1030,6 +1030,9 @@ done # http://sourceware.org/systemtap/wiki/SystemTapReleases %changelog +* Sat Sep 05 2015 Kalev Lember - 2.9-0.20150713git9d0b65f.1 +- Rebuilt for librpm soname bump + * Mon Jul 13 2015 Lukas Berk - 2.9-0.20150713git9d0b65f - Automated weekly rawhide release - Applied spec changes from upstream git From cfc6b8db22fba176c6922917225b6ede68a7e1c6 Mon Sep 17 00:00:00 2001 From: "Frank Ch. Eigler" Date: Thu, 8 Oct 2015 21:58:30 -0400 Subject: [PATCH 5/5] upstream release 2.9 --- .gitignore | 1 + sources | 2 +- systemtap.spec | 50 +++++++++++++------------------------------------- 3 files changed, 15 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 465b487..8c540f6 100644 --- a/.gitignore +++ b/.gitignore @@ -153,3 +153,4 @@ systemtap-1.3.tar.gz /systemtap-2.9-0.20150707git320e1ec.tar.gz /systemtap-2.9-0.20150707git86f726b.tar.gz /systemtap-2.9-0.20150713git9d0b65f.tar.gz +/systemtap-2.9.tar.gz diff --git a/sources b/sources index 2625f97..7f5d6ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30a7ad17d25adbc06af6c8f873ce2813 systemtap-2.9-0.20150713git9d0b65f.tar.gz +2f3c183966c82ec9d70c1de286b545fc systemtap-2.9.tar.gz diff --git a/systemtap.spec b/systemtap.spec index 159808f..6ae89c3 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -58,7 +58,7 @@ Name: systemtap Version: 2.9 -Release: 0.20150713git9d0b65f%{?dist}.1 +Release: 1%{?dist} # for version, see also configure.ac @@ -91,7 +91,7 @@ Summary: Programmable system-wide instrumentation system Group: Development/System License: GPLv2+ URL: http://sourceware.org/systemtap/ -Source: %{name}-%{version}-0.20150713git9d0b65f.tar.gz +Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz # Build* BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -773,14 +773,10 @@ exit 0 %if %{with_java} -%triggerin runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk +%triggerin runtime-java -- java-1.8.0-openjdk, java-1.7.0-openjdk, java-1.6.0-openjdk for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do - %ifarch %{ix86} ppc64 ppc64le - %ifarch ppc64 ppc64le - arch=ppc64 - %else - arch=i386 - %endif + %ifarch %{ix86} + arch=i386 %else arch=`basename $f | cut -f2 -d_ | cut -f1 -d.` %endif @@ -792,14 +788,10 @@ for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do done done -%triggerun runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk +%triggerun runtime-java -- java-1.8.0-openjdk, java-1.7.0-openjdk, java-1.6.0-openjdk for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do - %ifarch %{ix86} ppc64 ppc64le - %ifarch ppc64 ppc64le - arch=ppc64 - %else - arch=i386 - %endif + %ifarch %{ix86} + arch=i386 %else arch=`basename $f | cut -f2 -d_ | cut -f1 -d.` %endif @@ -809,15 +801,11 @@ for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do done done -%triggerpostun runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk +%triggerpostun runtime-java -- java-1.8.0-openjdk, java-1.7.0-openjdk, java-1.6.0-openjdk # Restore links for any JDKs remaining after a package removal: for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do - %ifarch %{ix86} ppc64 ppc64le - %ifarch ppc64 ppc64le - arch=ppc64 - %else - arch=i386 - %endif + %ifarch %{ix86} + arch=i386 %else arch=`basename $f | cut -f2 -d_ | cut -f1 -d.` %endif @@ -1030,20 +1018,8 @@ done # http://sourceware.org/systemtap/wiki/SystemTapReleases %changelog -* Sat Sep 05 2015 Kalev Lember - 2.9-0.20150713git9d0b65f.1 -- Rebuilt for librpm soname bump - -* 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 - -* Tue Jul 07 2015 Lukas Berk - 2.9-0.20150707git320e1ec -- Automated weekly rawhide release -- Applied spec changes from upstream git +* Thu Oct 08 2015 Frank Ch. Eigler - 2.9-1 +- Upstream release. * Wed Jun 17 2015 Abegail Jakop - 2.8-1 - Upstream release.