From 59091c84a4f51321d65483e9b8cf43003bed70d1 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 11 Dec 2024 07:27:37 +0100
Subject: [PATCH] Fix FTBFS after default Java change

Resolves: RHEL-71056
---
 javapackages-bootstrap.spec | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec
index cc9c6f2..87f6a1c 100644
--- a/javapackages-bootstrap.spec
+++ b/javapackages-bootstrap.spec
@@ -1,11 +1,10 @@
+%global java_arches aarch64 ppc64le s390x x86_64
+
 # Exclude automatically generated requires on java interpreter which is not
 # owned by any package
-%global         __requires_exclude ^/usr/lib/jvm/java
-
-# Don't run OSGi dependency generators on private (bundled) JARs
-%global         __requires_exclude_from \\.jar$
-%global         __provides_exclude_from \\.jar$
+%global         __requires_exclude ^%{_jvmdir}/java
 
+%global javaHomePath %{_jvmdir}/java-11-openjdk
 %global mavenHomePath %{_datadir}/%{name}
 %global metadataPath %{mavenHomePath}/maven-metadata
 %global artifactsPath %{_javadir}
@@ -13,12 +12,13 @@
 
 Name:           javapackages-bootstrap
 Version:        1.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A means of bootstrapping Java Packages Tools
 # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING
 License:        ASL 2.0 and ASL 1.1 and (ASL 2.0 or EPL-2.0) and (EPL-2.0 or GPLv2 with exceptions) and MIT and BSD with advertising and BSD and EPL-1.0 and EPL-2.0 and CDDL-1.0 and xpp and CC0 and Public Domain
 URL:            https://github.com/fedora-java/javapackages-bootstrap
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://github.com/fedora-java/javapackages-bootstrap/releases/download/%{version}/javapackages-bootstrap-%{version}.tar.xz
 
@@ -254,12 +254,12 @@ Provides:       bundled(xz-java) = 1.8
 
 BuildRequires:  byaccj
 BuildRequires:  java-11-openjdk-devel
-BuildRequires:  javapackages-generators
 
 Requires:       bash
 Requires:       coreutils
 Requires:       java-11-openjdk-devel
 Requires:       procps-ng
+Requires:       javapackages-common >= 6.4.0
 
 %description
 In a nutshell, Java Packages Bootstrap (JPB) is a standalone build of all Java
@@ -290,7 +290,7 @@ do
   tar -xf "${source}"
 done
 
-%patch0 -p1
+%patch -P0 -p1
 
 for patch_path in patches/*/*
 do
@@ -304,10 +304,11 @@ done
 
 %build
 export LC_ALL=C.utf8
-JAVA_HOME=%{java_home} ./mbi.sh build -parallel
+JAVA_HOME=%{javaHomePath} ./mbi.sh build -parallel
 
 %install
-JAVA_HOME=%{java_home} ./mbi.sh dist \
+JAVA_HOME=%{javaHomePath} ./mbi.sh dist \
+  -javaCmdPath=%{javaHomePath}/bin/java \
   -basePackageName=%{name} \
   -installRoot=%{buildroot} \
   -mavenHomePath=%{mavenHomePath} \
@@ -343,6 +344,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_
 %doc AUTHORS
 
 %changelog
+* Thu Dec 12 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0-3
+- Fix FTBFS after default Java change
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.0-2
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688