Drop dependency on javapackages-tools

This commit is contained in:
Mikolaj Izdebski 2020-01-29 13:53:22 +01:00
parent 08c5f55d99
commit f7004f1462
2 changed files with 7 additions and 19 deletions

View File

@ -1,14 +1,14 @@
From 056c94f86450c7c27f5bb11f98653c73bfe3d8e4 Mon Sep 17 00:00:00 2001
From 247eafd819d6092661ebc57c54815acd20abd3de Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Wed, 1 Feb 2017 14:54:26 +0100
Subject: [PATCH 1/4] Adapt mvn script
---
apache-maven/src/bin/mvn | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
apache-maven/src/bin/mvn | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index a554c6617..0c07ba6e2 100755
index a554c6617..739501af4 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -22,7 +22,7 @@
@ -20,13 +20,11 @@ index a554c6617..0c07ba6e2 100755
# MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
# -----------------------------------------------------------------------------
@@ -33,12 +33,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
@@ -33,12 +33,16 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
. /etc/mavenrc
fi
+ if [ -f /etc/java/maven.conf ] ; then
+ . /etc/java/maven.conf
+ fi
+ . /etc/java/maven.conf
+
if [ -f "$HOME/.mavenrc" ] ; then
. "$HOME/.mavenrc"
@ -34,18 +32,12 @@ index a554c6617..0c07ba6e2 100755
fi
+if [ -f /usr/share/java-utils/java-functions ] ; then
+ . /usr/share/java-utils/java-functions
+ set_jvm
+ set_javacmd
+fi
+export JAVA_HOME
+export JAVACMD
+
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
mingw=false;
@@ -63,7 +75,8 @@ done
@@ -63,7 +67,8 @@ done
saveddir=`pwd`

View File

@ -85,10 +85,6 @@ Requires(post): chkconfig
Requires(postun): chkconfig
%endif
# Require full javapackages-tools since maven-script uses
# /usr/share/java-utils/java-functions
Requires: javapackages-tools
%if 0%{?module_prefix:1}
%description -n %{module_prefix}%{name}
%{summary}.