[systemtap] Automated weekly systemtap rawhide release: 0.47.g2e9858c

[lukas berk]

commit 0c19749f5a52fc3b973bd1bc20c8e5e3d7ff60eb
Author: Lukas Berk <lberk at redhat.com>
Date:   Mon Aug 26 08:50:35 2013 -0400

    Automated weekly systemtap rawhide release: 0.47.g2e9858c

 .gitignore     |    1 +
 sources        |    2 +-
 systemtap.spec |   46 +++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 41 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d20856..f1f0e0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ systemtap-1.3.tar.gz
 /systemtap-2.4-0.9.geada930.tar.gz
 /systemtap-2.4-0.19.g03207fd.tar.gz
 /systemtap-2.4-0.25.g3f873e5.tar.gz
+/systemtap-2.4-0.47.g2e9858c.tar.gz
diff --git a/sources b/sources
index 6d512b6..94e746c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a54dd6c2605fb377576aea02e2d71194  systemtap-2.4-0.25.g3f873e5.tar.gz
+430f2a966b6ef2e6b0d334d6595de6b8  systemtap-2.4-0.47.g2e9858c.tar.gz
diff --git a/systemtap.spec b/systemtap.spec
index 90d7b06..5726ef0 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -32,7 +32,7 @@
 
 Name: systemtap
 Version: 2.4
-Release: 0.25.g3f873e5%{?dist}
+Release: 0.47.g2e9858c%{?dist}
 # for version, see also configure.ac
 
 
@@ -63,7 +63,7 @@ Summary: Programmable system-wide instrumentation system
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.25.g3f873e5.tar.gz
+Source: %{name}-%{version}-0.47.g2e9858c.tar.gz
 
 # Build*
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -107,6 +107,10 @@ BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
 %if %{with_publican}
 BuildRequires: publican
 BuildRequires: /usr/share/publican/Common_Content/%{publican_brand}/defaults.cfg
+
+# A workaround for BZ920216 which requires an X server to build docs
+# with publican.
+BuildRequires: /usr/bin/xvfb-run
 %endif
 %endif
 %if %{with_emacsvim}
@@ -115,8 +119,6 @@ BuildRequires: emacs
 %if %{with_java}
 BuildRequires: jpackage-utils java-devel
 %endif
-# A workaround for BZ920216 which requires an X server to build docs
-BuildRequires: /usr/bin/xvfb-run
 
 # Install requirements
 Requires: systemtap-client = %{version}-%{release}
@@ -246,6 +248,8 @@ Requires: systemtap-sdt-devel = %{version}-%{release}
 Requires: systemtap-server = %{version}-%{release}
 Requires: dejagnu which elfutils grep nc
 Requires: gcc gcc-c++ make glibc-devel
+# testsuite/systemtap.base/ptrace.exp needs strace
+Requires: strace
 %ifnarch ia64
 Requires: prelink
 %endif
@@ -592,7 +596,15 @@ exit 0
 
 %triggerin runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk
 for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
-    arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
+    %ifarch %{ix86} ppc64
+        %ifarch ppc64
+            arch=ppc64
+	%else
+	    arch=i386
+	%endif
+    %else
+        arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
+    %endif
     for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do
         ln -sf %{_libexecdir}/systemtap/libHelperSDT_${arch}.so ${archdir}/libHelperSDT_${arch}.so
         ln -sf %{_libexecdir}/systemtap/HelperSDT.jar ${archdir}/../ext/HelperSDT.jar
@@ -601,7 +613,15 @@ done
 
 %triggerun runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk
 for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
-    arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
+    %ifarch %{ix86} ppc64
+        %ifarch ppc64
+            arch=ppc64
+	%else
+	    arch=i386
+	%endif
+    %else
+        arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
+    %endif
     for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do
         rm -f ${archdir}/libHelperSDT_${arch}.so
         rm -f ${archdir}/../ext/HelperSDT.jar
@@ -611,7 +631,15 @@ 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
-    arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
+    %ifarch %{ix86} ppc64
+        %ifarch ppc64
+            arch=ppc64
+	%else
+	    arch=i386
+	%endif
+    %else
+        arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
+    %endif
     for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do
         ln -sf %{_libexecdir}/systemtap/libHelperSDT_${arch}.so ${archdir}/libHelperSDT_${arch}.so
         ln -sf %{_libexecdir}/systemtap/HelperSDT.jar ${archdir}/../ext/HelperSDT.jar
@@ -783,6 +811,10 @@ done
 # ------------------------------------------------------------------------
 
 %changelog
+* Mon Aug 26 2013 Lukas Berk <lberk at redhat.com> - 2.4-0.47.g2e9858c
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Aug 19 2013 Lukas Berk <lberk at redhat.com> - 2.4-0.25.g3f873e5
 - Automated weekly rawhide release