From e8684079a1670db5aa943ae300d587257120e553 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 14 Jun 2022 08:12:52 +0200
Subject: [PATCH] Add openjdk8 subpackage

---
 javapackages-bootstrap.spec | 27 +++++++++++++++++++++++----
 toolchains-openjdk8.xml     | 11 +++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 toolchains-openjdk8.xml

diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec
index 02ce9cd..da3808d 100644
--- a/javapackages-bootstrap.spec
+++ b/javapackages-bootstrap.spec
@@ -17,7 +17,7 @@
 
 Name:           javapackages-bootstrap
 Version:        1.7.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
@@ -31,6 +31,8 @@ Source0:        https://github.com/fedora-java/javapackages-bootstrap/releases/d
 # License breakdown
 Source1:        javapackages-bootstrap-PACKAGE-LICENSING
 
+Source101:      toolchains-openjdk8.xml
+
 # To obtain the following sources:
 # tar -xf ${name}-${version}.tar.xz
 # pushd ${name}-${version}
@@ -268,6 +270,8 @@ Requires:       coreutils
 Requires:       java-17-openjdk-devel
 Requires:       procps-ng
 
+Requires:       javapackages-common
+
 %description
 In a nutshell, Java Packages Bootstrap (JPB) is a standalone build of all Java
 software packages that are required for Java Packages Tools (JPT) to work.
@@ -285,12 +289,20 @@ depend on JPB for everything, without depending on any other Java packages. For
 example, JPB contains embedded version of XMvn, removing dependency of JPT on
 XMvn, allowing JPT to be used before one builds XMvn package.
 
+%package openjdk8
+Summary:        OpenJDK 8 toolchain for Java Packages Bootstrap
+Requires:       %{name}
+Requires:       java-1.8.0-openjdk-devel
+
+%description openjdk8
+OpenJDK 8 toolchain for Java Packages Bootstrap.
+
 %prep
 %setup -q
 
 # leave out the first source as it has already been extracted
 # leave out licensing breakdown file
-other_sources=$(echo %{sources} | cut -d' ' -f3-)
+other_sources=$(echo %{sources} | cut -d' ' -f4-)
 
 for source in ${other_sources}
 do
@@ -328,8 +340,8 @@ JAVA_HOME=%{javaHomePath} ./mbi.sh dist \
   -launchersPath=%{launchersPath} \
   -licensesPath=%{_licensedir}/%{name} \
 
-# Use toolchains.xml provided by javapackages-tools
-rm %{buildroot}%{mavenHomePath}/conf/toolchains.xml
+# Use custom toolchains.xml
+cp -p %{SOURCE101} %{buildroot}%{mavenHomePath}/conf/toolchains.xml
 
 install -d -m 755 %{buildroot}%{_rpmmacrodir}
 echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_rpmmacrodir}/macros.%{name}
@@ -339,16 +351,23 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_
 
 %files
 %{mavenHomePath}
+%exclude %{mavenHomePath}/conf/toolchains.xml
 %{metadataPath}/*
 %{artifactsPath}/*
 %{launchersPath}/*
 %{_rpmmacrodir}
 
+%files openjdk8
+%{mavenHomePath}/conf/toolchains.xml
+
 %license %{_licensedir}/%{name}
 %doc README.md
 %doc AUTHORS
 
 %changelog
+* Tue Jun 14 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-3
+- Add openjdk8 toolchain subpackage
+
 * Mon Jun 06 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-2
 - Drop build-requires on javapackages-generators
 
diff --git a/toolchains-openjdk8.xml b/toolchains-openjdk8.xml
new file mode 100644
index 0000000..25d130f
--- /dev/null
+++ b/toolchains-openjdk8.xml
@@ -0,0 +1,11 @@
+<toolchains>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <xmvn>xmvn</xmvn>
+    </provides>
+    <configuration>
+      <jdkHome>/usr/lib/jvm/java-1.8.0-openjdk</jdkHome>
+    </configuration>
+  </toolchain>
+</toolchains>