From cb20903f29e962ef4755a416c7f4df166bdf1e2b027e462ca9c847bf2db9d50d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 8 Oct 2024 06:29:42 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=162

---
 do-not-require-which.patch | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/do-not-require-which.patch b/do-not-require-which.patch
index 589c8e2..8a2cdbf 100644
--- a/do-not-require-which.patch
+++ b/do-not-require-which.patch
@@ -1,5 +1,23 @@
---- javapackages-6.3.2/java-utils/java-functions	2024-10-07 22:01:07.498351430 +0200
-+++ javapackages-6.3.2/java-utils/java-functions	2024-10-07 22:01:41.697647647 +0200
+--- javapackages-6.3.2/javapackages-tools.spec	2024-10-08 08:19:44.208034468 +0200
++++ javapackages-6.3.2/javapackages-tools.spec	2024-10-08 08:21:27.532053244 +0200
+@@ -22,7 +22,6 @@
+ Source21:       toolchains-openjdk21.xml
+ 
+ BuildRequires:  coreutils
+-BuildRequires:  which
+ BuildRequires:  make
+ BuildRequires:  rubygem-asciidoctor
+ BuildRequires:  %{python_prefix}-devel
+@@ -33,7 +32,6 @@
+ Requires:       javapackages-filesystem = %{version}-%{release}
+ Requires:       coreutils
+ Requires:       findutils
+-Requires:       which
+ 
+ Provides:       jpackage-utils = %{version}-%{release}
+ 
+--- javapackages-6.3.2/java-utils/java-functions	2024-10-08 08:19:44.211367825 +0200
++++ javapackages-6.3.2/java-utils/java-functions	2024-10-08 08:21:27.535386599 +0200
 @@ -169,7 +169,7 @@
          done
      fi
@@ -9,7 +27,16 @@
      if [ -x "${JAVACMD}" ]; then
  	_log "Using JAVACMD from PATH: $JAVACMD"
  	if [ -n "${JAVACMD_OPTS}" ]; then
-@@ -315,7 +315,7 @@
+@@ -179,6 +179,8 @@
+ 	    JAVACMD="@{javadir}-utils/java-wrapper"
+ 	fi
+ 	return 0
++    else
++        unset JAVACMD
+     fi
+ 
+     _err "Failed to set JAVACMD"
+@@ -315,7 +317,7 @@
  {
      local IFS=:
      local artifact="${1}"