File tree Expand file tree Collapse file tree 3 files changed +3
-5
lines changed
Expand file tree Collapse file tree 3 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -84,7 +84,7 @@ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
8484test -z " ${rpmmacrodir} " && rpmmacrodir=" ${rpmconfigdir} /macros.d"
8585
8686test -z " ${m2home} " && m2home=" ${datadir} /xmvn"
87- test -z " ${pyinterpreter} " && pyinterpreter=$( which python)
87+ test -z " ${pyinterpreter} " && pyinterpreter=$( type -p python)
8888test -z " ${abrtlibdir} " && abrtlibdir=" ${prefix} /lib/abrt-java-connector"
8989
9090eval $( sed -n ' s/^%_\(' " $vars_re " ' \)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem)
Original file line number Diff line number Diff line change @@ -169,7 +169,7 @@ set_javacmd()
169169 done
170170 fi
171171
172- JAVACMD=$( which java 2> /dev/null || :)
172+ JAVACMD=$( type -p java 2> /dev/null || :)
173173 if [ -x " ${JAVACMD} " ]; then
174174 _log " Using JAVACMD from PATH: $JAVACMD "
175175 else
@@ -324,7 +324,7 @@ find_jar()
324324{
325325 local IFS=:
326326 local artifact=" ${1} "
327- local cmd=$( which xmvn-resolve 2> /dev/null || :)
327+ local cmd=$( type -p xmvn-resolve 2> /dev/null || :)
328328
329329 # If artifact contains semicolon then assume it specifies Maven
330330 # artifact coordinates.
Original file line number Diff line number Diff line change @@ -22,7 +22,6 @@ Source: https://github.com/fedora-java/javapackages/archive/%{version}.t
2222Source21: toolchains-openjdk21.xml
2323
2424BuildRequires: coreutils
25- BuildRequires: which
2625BuildRequires: make
2726BuildRequires: rubygem-asciidoctor
2827BuildRequires: %{python_prefix }-devel
@@ -33,7 +32,6 @@ BuildRequires: %{python_prefix}-pytest
3332Requires: javapackages-filesystem = %{version }-%{release }
3433Requires: coreutils
3534Requires: findutils
36- Requires: which
3735
3836Provides: jpackage-utils = %{version }-%{release }
3937
You can’t perform that action at this time.
0 commit comments