From b6199561fa0339c5177f7e399d5cc9aa41d3a3de Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 13 Dec 2023 07:54:33 +0100
Subject: [PATCH] Make JDK bindings work with different Maven version suffixes

---
 0001-Adapt-mvn-script.patch |  2 +-
 maven.spec                  | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch
index 6094062..3f45458 100644
--- a/0001-Adapt-mvn-script.patch
+++ b/0001-Adapt-mvn-script.patch
@@ -33,7 +33,7 @@ index a3004f917..9b118717e 100755
    fi
  
 +  if [ -z "$JAVA_HOME" ] ; then
-+    . /etc/java/maven.conf
++    . /etc/java/maven@{maven_version_suffix}.conf
 +  fi
 +
    if [ -f "$HOME/.mavenrc" ] ; then
diff --git a/maven.spec b/maven.spec
index 67b75b3..bcc0282 100644
--- a/maven.spec
+++ b/maven.spec
@@ -7,7 +7,7 @@
 Name:           maven
 Epoch:          1
 Version:        3.9.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java project management and project comprehension tool
 # maven itself is Apache-2.0
 # bundled slf4j is MIT
@@ -170,6 +170,7 @@ find -name 'pom.xml' -exec sed -i 's/\r//' {} +
 %patch -P 1 -p1
 %patch -P 2 -p1
 %patch -P 3 -p1
+sed -i "s/@{maven_version_suffix}/%{?maven_version_suffix}/" apache-maven/src/bin/mvn
 
 # not really used during build, but a precaution
 find -name '*.jar' -not -path '*/test/*' -delete
@@ -261,10 +262,10 @@ ln -s %{homedir}/bin/mvnDebug.1.gz %{buildroot}%{_mandir}/man1/mvnDebug%{maven_v
 
 # JDK bindings
 install -d -m 755 %{buildroot}%{_javaconfdir}/
-echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk8
-echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk11
-echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk17
-echo JAVA_HOME=%{_jvmlibdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven.conf-openjdk21
+echo JAVA_HOME=%{_jvmlibdir}/jre-1.8.0-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk8
+echo JAVA_HOME=%{_jvmlibdir}/jre-11-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk11
+echo JAVA_HOME=%{_jvmlibdir}/jre-17-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk17
+echo JAVA_HOME=%{_jvmlibdir}/jre-21-openjdk >%{buildroot}%{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk21
 
 
 %post
@@ -302,18 +303,21 @@ if [[ $1 -eq 0 ]]; then update-alternatives --remove mvn %{homedir}/bin/mvn; fi
 %endif
 
 %files openjdk8
-%config %{_javaconfdir}/maven.conf-openjdk8
+%config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk8
 
 %files openjdk11
-%config %{_javaconfdir}/maven.conf-openjdk11
+%config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk11
 
 %files openjdk17
-%config %{_javaconfdir}/maven.conf-openjdk17
+%config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk17
 
 %files openjdk21
-%config %{_javaconfdir}/maven.conf-openjdk21
+%config %{_javaconfdir}/maven%{?maven_version_suffix}.conf-openjdk21
 
 %changelog
+* Wed Dec 13 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.9.6-2
+- Make JDK bindings work with different Maven version suffixes
+
 * Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.9.6-1
 - Update to upstream version 3.9.6