From 67d9400bee1d3b966e9478bbb19eb95e1b0281f0 Mon Sep 17 00:00:00 2001
From: Sergey Zhemoytel <djam5@ya.ru>
Date: Tue, 4 Jun 2024 12:16:09 +0000
Subject: [PATCH] 19096

---
 .abf.yml  |  2 +-
 josm.spec | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 1a6b2ac..6be4d4e 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  josm-19067.tar.gz: 615763d0a527af1701d9a581758e51902988d7e0
+  josm-19096.tar.gz: 6afa4926361453ad97bc5593877633982456980d
diff --git a/josm.spec b/josm.spec
index 126bf44..2b55b6b 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,6 +1,9 @@
+%define     jdk_ver jdk17
+%global     JAVA_HOME /opt/%{jdk_ver}/jdk
+
 Name:		josm
 Summary:	Java-based OSM editor
-Version:	19067
+Version:	19096
 Release:	1
 License:	GPLv2+
 URL:		https://josm.openstreetmap.de
@@ -32,12 +35,12 @@ from using them in creative, productive or unexpected ways.
 #svn co -r %{version} https://josm.openstreetmap.de/svn/trunk $RPM_BUILD_DIR/%{name}-%{version}
 %setup -qn %{name}-%{version}-tested
 # fix deps org.jacoco.ant
-sed -i '/org.jacoco.ant/s/-SNAPSHOT//' ivy.xml
+#sed -i '/org.jacoco.ant/s/-SNAPSHOT//' ivy.xml
 
 %build
-export JAVA_HOME=/opt/jdk17
+#xport JAVA_HOME=/opt/jdk17
 #cd $RPM_BUILD_DIR/%{name}-%{version}
-ant -Dversion.entry.commit.revision=%{version} dist-optimized
+JAVA_HOME=%{JAVA_HOME} ant -Dversion.entry.commit.revision=%{version} dist-optimized
 
 %install
 rm -rf %{buildroot}
@@ -73,7 +76,7 @@ cat > %{buildroot}%{_bindir}/%{name} << EOF
 #!/bin/bash
 
 PROGRAM_DIR=%{_datadir}/%{name}
-JAVABIN=/usr/bin/java
+JAVABIN=/opt/%{jdk_ver}/jdk/bin/java
 
 exec \$JAVABIN -Xmx2048m -jar \$PROGRAM_DIR/%{name}.jar