[systemtap/f19] Upstream release.

Mon Sep 8 22:17:46 UTC 2014

commit a0d02f20c11503fc2b53ad95fa74ea7ab354b3f3
Author: Josh Stone <jistone at redhat.com>
Date:   Mon Sep 8 09:44:27 2014 -0700

    Upstream release.

 .gitignore     |    1 +
 PR16894.patch  |  234 --------------------------------------------------------
 sources        |    2 +-
 systemtap.spec |   56 ++++++++-----
 4 files changed, 36 insertions(+), 257 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 4297966..7d96eb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,3 +97,4 @@ systemtap-1.3.tar.gz
 /systemtap-2.5-0.491.gd0e1cd9d2fcb.tar.gz
 /systemtap-2.5-0.535.g9d4241d37eb1.tar.gz
 /systemtap-2.5.tar.gz
+/systemtap-2.6.tar.gz
diff --git a/sources b/sources
index 96cff03..5bb0b17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a33c6f2ac5d6b77d8d02246685ee5105  systemtap-2.5.tar.gz
+65e6745f0ec103758c711dd1d12fb6bf  systemtap-2.6.tar.gz
diff --git a/systemtap.spec b/systemtap.spec
index e348afa..bb6c2cc 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -21,15 +21,14 @@
 %else
 %{!?publican_brand: %global publican_brand fedora}
 %endif
-%ifnarch s390 s390x %{arm} aarch64 ppc64le
+%ifarch %{ix86} x86_64 ppc ppc64
 %{!?with_dyninst: %global with_dyninst 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
 %else
 %{!?with_dyninst: %global with_dyninst 0}
 %endif
 %{!?with_systemd: %global with_systemd 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
-%{!?with_emacsvim: %global with_emacsvim 1}
-%{!?with_java: %global with_java 1}
-# don't want to build runtime-virthost for f18 or RHEL5/6
+%{!?with_emacsvim: %global with_emacsvim 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
+%{!?with_java: %global with_java 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
 %{!?with_virthost: %global with_virthost 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
 %{!?with_virtguest: %global with_virtguest 1}
 %{!?with_dracut: %global with_dracut 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
@@ -40,6 +39,7 @@
 %{!?with_mokutil: %global with_mokutil 0}
 %{!?with_openssl: %global with_openssl 0}
 %endif
+%{!?with_pyparsing: %global with_pyparsing 0%{?fedora} >= 18 || 0%{?rhel} >= 7}
 
 %ifarch ppc64le
 %global with_virthost 0
@@ -67,8 +67,8 @@
 %define dracutstap %{dracutlibdir}/modules.d/99stap
 
 Name: systemtap
-Version: 2.5
-Release: 3%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 # for version, see also configure.ac
 
 
@@ -103,8 +103,6 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
 
-Patch10: PR16894.patch
-
 # Build*
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-c++
@@ -280,6 +278,9 @@ Summary: Static probe support tools
 Group: Development/System
 License: GPLv2+ and Public Domain
 URL: http://sourceware.org/systemtap/
+%if %{with_pyparsing}
+Requires: pyparsing
+%endif
 
 %description sdt-devel
 This package includes the <sys/sdt.h> header file used for static
@@ -304,7 +305,7 @@ Requires: strace
 # that provides nc has changed over time (from 'nc' to
 # 'nmap-ncat'). So, we'll do a file-based require.
 Requires: /usr/bin/nc
-%ifnarch ia64 ppc64le
+%ifnarch ia64 ppc64le aarch64
 Requires: prelink
 %endif
 # testsuite/systemtap.server/client.exp needs avahi
@@ -399,8 +400,6 @@ find . \( -name configure -o -name config.h.in \) -print | xargs touch
 cd ..
 %endif
 
-%patch10 -p1
-
 %build
 
 %if %{with_bundled_elfutils}
@@ -775,8 +774,8 @@ exit 0
 
 %triggerin runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk
 for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
-    %ifarch %{ix86} ppc64
-        %ifarch ppc64
+    %ifarch %{ix86} ppc64 ppc64le
+        %ifarch ppc64 ppc64le
             arch=ppc64
 	%else
 	    arch=i386
@@ -794,8 +793,8 @@ done
 
 %triggerun runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk
 for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
-    %ifarch %{ix86} ppc64
-        %ifarch ppc64
+    %ifarch %{ix86} ppc64 ppc64le
+        %ifarch ppc64 ppc64le
             arch=ppc64
 	%else
 	    arch=i386
@@ -812,8 +811,8 @@ done
 %triggerpostun runtime-java -- 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
-        %ifarch ppc64
+    %ifarch %{ix86} ppc64 ppc64le
+        %ifarch ppc64 ppc64le
             arch=ppc64
 	%else
 	    arch=i386
@@ -868,7 +867,9 @@ done
 %dir %attr(0755,stap-server,stap-server) %{_localstatedir}/log/stap-server
 %ghost %config(noreplace) %attr(0644,stap-server,stap-server) %{_localstatedir}/log/stap-server/log
 %ghost %attr(0755,stap-server,stap-server) %{_localstatedir}/run/stap-server
-%doc README README.unprivileged AUTHORS NEWS COPYING
+%doc README README.unprivileged AUTHORS NEWS 
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 
 
 %files devel -f systemtap.lang
@@ -884,7 +885,9 @@ done
 %{_mandir}/man7/error*
 %{_mandir}/man7/stappaths.7*
 %{_mandir}/man7/warning*
-%doc README README.unprivileged AUTHORS NEWS COPYING
+%doc README README.unprivileged AUTHORS NEWS 
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %if %{with_java}
 %dir %{_libexecdir}/systemtap
 %{_libexecdir}/systemtap/libHelperSDT_*.so
@@ -925,12 +928,16 @@ done
 %if %{with_dyninst}
 %{_mandir}/man8/stapdyn.8*
 %endif
-%doc README README.security AUTHORS NEWS COPYING
+%doc README README.security AUTHORS NEWS 
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 
 
 %files client -f systemtap.lang
 %defattr(-,root,root)
-%doc README README.unprivileged AUTHORS NEWS COPYING examples
+%doc README README.unprivileged AUTHORS NEWS examples
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 %if %{with_docs}
 %doc docs.installed/*.pdf
 %doc docs.installed/tapsets/*.html
@@ -976,7 +983,9 @@ done
 %{_includedir}/sys/sdt.h
 %{_includedir}/sys/sdt-config.h
 %{_mandir}/man1/dtrace.1*
-%doc README AUTHORS NEWS COPYING
+%doc README AUTHORS NEWS 
+%{!?_licensedir:%global license %%doc}
+%license COPYING
 
 
 %files testsuite
@@ -1021,6 +1030,9 @@ done
 #   http://sourceware.org/systemtap/wiki/SystemTapReleases
 
 %changelog
+* Fri Sep 05 2014 Josh Stone <jistone at redhat.com> - 2.6-1
+- Upstream release.
+
 * Wed Aug 20 2014 Josh Stone <jistone at redhat.com> - 2.5-3
 - Rebuilt for dyninst-8.2.0
 
