OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=164

fix-broken-commands.patch

@@ -0,0 +1,18 @@
+--- a/macros.d/macros.jpackage
++++ b/macros.d/macros.jpackage
+@@ -10,11 +10,11 @@
+ #==============================================================================
+ # ---- default Java commands
+ 
+-%ant            %{?jpb_env} JAVA_HOME=%{java_home} ant
+-%jar            %{java_home}/bin/jar
++%ant            %{?jpb_env} ant
++%jar            jar
+ %java           %(. @{javadir}-utils/java-functions; set_javacmd; echo $JAVACMD)
+-%javac          %{java_home}/bin/javac
+-%javadoc        %{java_home}/bin/javadoc
++%javac          javac
++%javadoc        javadoc
+ 
+ 
+ #

javapackages-tools.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Oct  8 22:48:45 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * fix-broken-commands.patch
+    + fix commands broken after recent removal of the default
+      %%{java_home} macro
+
 -------------------------------------------------------------------
 Mon Oct  7 17:38:56 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

javapackages-tools.spec

@@ -48,6 +48,8 @@ Patch2:         suse-no-epoch.patch
 #
 #PATCH-FIX-UPSTREAM: do not fail if which does not exist
 Patch3:         do-not-require-which.patch
+#PATCH-FIX-UPSTREAM: fix broken %%ant, %%jar, %%javadoc and %%javac commands
+Patch4:         fix-broken-commands.patch
 
 BuildRequires:  fdupes
 BuildRequires:  perl