From 84959d29ef7576c7f3f982577e5c77ef9726dd6f Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Tue, 4 May 2021 13:45:21 -0400
Subject: [PATCH] Automated weekly systemtap rawhide release:
 0.202105041345git02b6be05fb76

---
 .gitignore     |  1 +
 sources        |  2 +-
 systemtap.spec | 80 +++++++++++++++-----------------------------------
 3 files changed, 25 insertions(+), 58 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa8389e..3aa7e5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@
 /systemtap-4.5-0.202102231232git663a93e8b82b.tar.gz
 /systemtap-4.5-0.202104140931gitad00fb87e.tar.gz
 /systemtap-4.5-0.202104140933gitad00fb87e.tar.gz
+/systemtap-4.5-0.202105041345git02b6be05fb76.tar.gz
diff --git a/sources b/sources
index e68576c..3b316a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (systemtap-4.5-0.202104140933gitad00fb87e.tar.gz) = d3af3972b1ef255e31fd84e3e41b3c7f76f474f5ace4940cbbe74427d4b04e9e8427ae1684a039174c963c11b4620ec7df2b050de8d35613183f377add8e07ea
+SHA512 (systemtap-4.5-0.202105041345git02b6be05fb76.tar.gz) = 5a91402979927039d04ca77aeb3432b7b2507ccc96a196c68430fbcb1162439653c656a51c9049e0ecf7c0fd212beb627a22f9a5e3e78aa36a4a92c4bb11df45
diff --git a/systemtap.spec b/systemtap.spec
index 2af1631..5538cc4 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -90,7 +90,7 @@
 
 Name: systemtap
 Version: 4.5
-Release: 0.202104300933gitad00fb87e%{?dist}
+Release: 0.202105041345git02b6be05fb76%{?dist}
 # for version, see also configure.ac
 
 
@@ -124,7 +124,7 @@ Release: 0.202104300933gitad00fb87e%{?dist}
 Summary: Programmable system-wide instrumentation system
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.202104140933gitad00fb87e.tar.gz
+Source: %{name}-%{version}-0.202105041345git02b6be05fb76.tar.gz
 
 # Build*
 BuildRequires: make
@@ -177,7 +177,7 @@ BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
 BuildRequires: emacs
 %endif
 %if %{with_java}
-BuildRequires: jpackage-utils java-devel
+BuildRequires: java-devel
 %endif
 %if %{with_virthost}
 # BuildRequires: libvirt-devel >= 1.0.2
@@ -373,6 +373,13 @@ Requires: dejagnu which elfutils grep nc
 %if %{with_debuginfod}
 Requires: elfutils-debuginfod
 %endif
+# work around fedora ci gating kvetching about i686<->x86-64 conflicts
+%ifarch x86_64
+Conflicts: systemtap-testsuite = %{version}-%{release}.i686
+%endif
+%ifarch i686
+Conflicts: systemtap-testsuite = %{version}-%{release}.x86_64
+%endif
 Requires: gcc gcc-c++ make glibc-devel
 # testsuite/systemtap.base/ptrace.exp needs strace
 Requires: strace
@@ -432,6 +439,13 @@ Summary: Systemtap Java Runtime Support
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
+# work around fedora ci gating kvetching about i686<->x86-64 conflicts
+%ifarch x86_64
+Conflicts: systemtap-runtime = %{version}-%{release}.i686
+%endif
+%ifarch i686
+Conflicts: systemtap-runtime = %{version}-%{release}.x86_64
+%endif
 Requires: byteman > 2.0
 Requires: iproute
 Requires: java-devel
@@ -967,58 +981,6 @@ exit 0
 
 # ------------------------------------------------------------------------
 
-%if %{with_java}
-
-%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}
-	arch=i386
-    %else
-        arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
-    %endif
-    for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do
-	 if [ -d ${archdir} ]; then
-            ln -sf %{_libexecdir}/systemtap/libHelperSDT_${arch}.so ${archdir}/libHelperSDT_${arch}.so
-            ln -sf %{_libexecdir}/systemtap/HelperSDT.jar ${archdir}/../ext/HelperSDT.jar
-	 fi
-    done
-done
-
-%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}
-	arch=i386
-    %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
-    done
-done
-
-%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}
-	arch=i386
-    %else
-        arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
-    %endif
-    for archdir in %{_jvmdir}/*openjdk*/jre/lib/${arch}; do
-	 if [ -d ${archdir} ]; then
-            ln -sf %{_libexecdir}/systemtap/libHelperSDT_${arch}.so ${archdir}/libHelperSDT_${arch}.so
-            ln -sf %{_libexecdir}/systemtap/HelperSDT.jar ${archdir}/../ext/HelperSDT.jar
-	 fi
-    done
-done
-
-# XXX: analogous support for other types of JRE/JDK??
-
-%endif
-
-# ------------------------------------------------------------------------
-
 %files
 # The main "systemtap" rpm doesn't include any files.
 
@@ -1074,7 +1036,7 @@ done
 %license COPYING
 %if %{with_java}
 %dir %{_libexecdir}/systemtap
-%{_libexecdir}/systemtap/libHelperSDT_*.so
+%{_libexecdir}/systemtap/libHelperSDT.so
 %endif
 %if %{with_emacsvim}
 %{_emacs_sitelispdir}/*.el*
@@ -1194,7 +1156,7 @@ done
 %if %{with_java}
 %files runtime-java
 %dir %{_libexecdir}/systemtap
-%{_libexecdir}/systemtap/libHelperSDT_*.so
+%{_libexecdir}/systemtap/libHelperSDT.so
 %{_libexecdir}/systemtap/HelperSDT.jar
 %{_libexecdir}/systemtap/stapbm
 %endif
@@ -1248,6 +1210,10 @@ done
 
 # PRERELEASE
 %changelog
+* Tue May 04 2021 Frank Ch. Eigler <fche@redhat.com> - 4.5-0.202105041345git02b6be05fb76
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Fri Apr 30 2021 Stan Cox <scox@redhat.com> - 4.5-0.202104300933gitad00fb87e
 - Rebuild for dyninst 11.0.0