Merge branch 'f23' into f21
* f23: upstream release 2.9 Rebuilt for librpm soname bump Automated weekly systemtap rawhide release: 0.20150713git9d0b65f Automated weekly systemtap rawhide release: 0.20150707git86f726b Automated weekly systemtap rawhide release: 0.20150707git320e1ec Conflicts: systemtap.spec
This commit is contained in:
Frank Ch. Eigler
commit
23d73dda24
|
|
@ -151,3 +151,7 @@ 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
|
||||
/systemtap-2.9-0.20150707git86f726b.tar.gz
|
||||
/systemtap-2.9-0.20150713git9d0b65f.tar.gz
|
||||
/systemtap-2.9.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
2cb77a01b1522ecdb83df1c878160bc1 systemtap-2.8.tar.gz
|
||||
2f3c183966c82ec9d70c1de286b545fc systemtap-2.9.tar.gz
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -56,8 +57,8 @@
|
|||
%define dracutstap %{_prefix}/lib/dracut/modules.d/99stap
|
||||
|
||||
Name: systemtap
|
||||
Version: 2.8
|
||||
Release: 2%{?dist}
|
||||
Version: 2.9
|
||||
Release: 1%{?dist}
|
||||
# for version, see also configure.ac
|
||||
|
||||
|
||||
|
|
@ -143,8 +144,6 @@ BuildRequires: libvirt-devel >= 1.0.2
|
|||
BuildRequires: libxml2-devel
|
||||
%endif
|
||||
|
||||
Patch2: systemtap-2.8-bz1240682.patch
|
||||
|
||||
# Install requirements
|
||||
Requires: systemtap-client = %{version}-%{release}
|
||||
Requires: systemtap-devel = %{version}-%{release}
|
||||
|
|
@ -262,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 <sys/sdt.h> header file used for static
|
||||
|
|
@ -289,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}
|
||||
|
|
@ -383,8 +390,6 @@ find . \( -name configure -o -name config.h.in \) -print | xargs touch
|
|||
cd ..
|
||||
%endif
|
||||
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
|
||||
%if %{with_bundled_elfutils}
|
||||
|
|
@ -462,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}
|
||||
|
|
@ -762,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
|
||||
|
|
@ -781,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
|
||||
|
|
@ -798,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
|
||||
|
|
@ -1019,6 +1018,9 @@ done
|
|||
# http://sourceware.org/systemtap/wiki/SystemTapReleases
|
||||
|
||||
%changelog
|
||||
* Thu Oct 08 2015 Frank Ch. Eigler <fche@redhat.com> - 2.9-1
|
||||
- Upstream release.
|
||||
|
||||
* Wed Sep 16 2015 David Smith <dsmith@redhat.com> - 2.8-2
|
||||
- Fix support for kernel 4.2 (BZ1240682).
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue