Automated weekly systemtap rawhide release: 4.8~pre16594741g5bdc37b9

.gitignore

@@ -81,3 +81,4 @@
 /systemtap-4.8~pre16557277g2882dcc9.tar.gz
 /systemtap-4.8~pre16578235g069e109c.tar.gz
 /systemtap-4.8~pre16594727g09f1b7bb.tar.gz
+/systemtap-4.8~pre16594741g5bdc37b9.tar.gz

sources

@@ -1 +1 @@
-SHA512 (systemtap-4.8~pre16594727g09f1b7bb.tar.gz) = c6fc1b4d23f864ea5b1937ebc5120b46ad6d0e20a869f6191807c86922fe7e536d25515b732f4f6fc25d828097e96d95ddce5e8d71c9972a65e307fcc9d1f7c8
+SHA512 (systemtap-4.8~pre16594741g5bdc37b9.tar.gz) = d47512e9bc09bb9b2babc08a66ad39004790e9903197aa595c0854737178e04b95fe577f391d4ab40bc36f2b968c7cb97d3a3d96334d09aa88b92719d8c122f3

systemtap.spec

@@ -20,7 +20,11 @@
 %{!?with_bpf: %global with_bpf 0%{?fedora} >= 22 || 0%{?rhel} >= 8}
 %{!?with_systemd: %global with_systemd 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
 %{!?with_emacsvim: %global with_emacsvim 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
+%ifarch %{ix86}
+%{!?with_java: %global with_java 0}
+%else
 %{!?with_java: %global with_java 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
+%endif
 %{!?with_debuginfod: %global with_debuginfod 0%{?fedora} >= 25 || 0%{?rhel} >= 7}
 %{!?with_virthost: %global with_virthost 0%{?fedora} >= 19 || 0%{?rhel} >= 7}
 %{!?with_virtguest: %global with_virtguest 1}
@@ -117,7 +121,7 @@ m     stapdev  stapdev
 
 
 Name: systemtap
-Version: 4.8~pre16594727g09f1b7bb
+Version: 4.8~pre16594741g5bdc37b9
 Release: 1%{?release_override}%{?dist}
 # for version, see also configure.ac
 
@@ -206,12 +210,8 @@ BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
 BuildRequires: emacs
 %endif
 %if %{with_java}
-%if 0%{?fedora} >= 36
-BuildRequires: java-latest-openjdk-devel
-%else
 BuildRequires: java-devel
 %endif
-%endif
 %if %{with_virthost}
 # BuildRequires: libvirt-devel >= 1.0.2
 BuildRequires: pkgconfig(libvirt)
@@ -488,11 +488,7 @@ Conflicts: systemtap-runtime = %{version}-%{release}.x86_64
 %endif
 Requires: byteman > 2.0
 Requires: iproute
-%if 0%{?fedora} >= 36
-BuildRequires: java-latest-openjdk-devel
-%else
 Requires: java-devel
-%endif
 
 %description runtime-java
 This package includes support files needed to run systemtap scripts
@@ -1290,6 +1286,10 @@ exit 0
 
 # PRERELEASE
 %changelog
+* Tue Aug 02 2022 Frank Ch. Eigler <fche@redhat.com> - 4.8-16594741g5bdc37b9
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Tue Aug 02 2022 Frank Ch. Eigler <fche@redhat.com> - 4.8-16594727g09f1b7bb
 - Automated weekly rawhide release
 - Applied spec changes from upstream git