From bad4983b27c98273e42fc789fc3b6715805cc266a94cf049d9c61510ee6eeec6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 11 May 2023 10:00:45 +0000 Subject: [PATCH] rediff patch to apply without leaving *.orig files OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=73 --- 0001-Adapt-mvn-script.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/0001-Adapt-mvn-script.patch b/0001-Adapt-mvn-script.patch index d814dc4..48bc3a3 100644 --- a/0001-Adapt-mvn-script.patch +++ b/0001-Adapt-mvn-script.patch @@ -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