pool/javapackages-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fridrich Strba 2024-10-08 06:29:42 +00:00 committed by Git OBS Bridge
parent edc96eb4da
commit cb20903f29
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
do-not-require-which.patch
View File

@ -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}"