From: Frank Ch. Eigler <fche@redhat.com>
Date: Tue, 2 Aug 2022 21:02:22 +0000 (-0400)
Subject: systemtap.spec: fedora i686 rawhide (!) ftbfs fix try 2
X-Git-Tag: release-4.8~67
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5bdc37b99f9bcef9f2cb4fe2deb2d53bb16a3ef6;p=systemtap.git

systemtap.spec: fedora i686 rawhide (!) ftbfs fix try 2
---

diff --git a/systemtap.spec b/systemtap.spec
index 833742b00..c2d78c253 100644
--- a/systemtap.spec
+++ b/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}
@@ -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