rediff patch to apply without leaving *.orig files

OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=73
This commit is contained in:
Fridrich Strba 2023-05-11 10:00:45 +00:00 committed by Git OBS Bridge
parent 9e313a809d
commit bad4983b27

View File

@ -11,7 +11,7 @@ diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index dfa384b8e..8c03825ed 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -37,12 +37,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
@@ -38,12 +38,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
. /etc/mavenrc
fi
@ -36,7 +36,7 @@ index dfa384b8e..8c03825ed 100755
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
mingw=false;
@@ -67,7 +79,8 @@ done
@@ -68,7 +80,8 @@ done
saveddir=`pwd`
@ -46,7 +46,7 @@ index dfa384b8e..8c03825ed 100755
# make it fully qualified
MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
@@ -105,7 +118,7 @@ if [ ! -x "$JAVACMD" ] ; then
@@ -106,7 +119,7 @@ if [ ! -x "$JAVACMD" ] ; then
exit 1
fi