From abf9b4a49aa43735c45bf1d68033f6614bc19ec5 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Mon, 18 Apr 2011 10:20:16 +0200
Subject: [PATCH] Enable MAVEN_OPTS override in scripts

---
 maven-script-local    | 2 +-
 maven-script-rpmbuild | 2 +-
 maven.spec            | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/maven-script-local b/maven-script-local
index a5ebc59..61499df 100644
--- a/maven-script-local
+++ b/maven-script-local
@@ -10,7 +10,7 @@ echo $JAVA_HOME
 export JAVA_HOME
 # can't put it on command line due to
 # http://jira.codehaus.org/browse/SUREFIRE-121
-export MAVEN_OPTS="-Dmaven.local.mode ${local_add}"
+export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.local.mode ${local_add}"
 echo "Running mvn in local mode. Please report bugs to http://bugzilla.redhat.com"
 
 $M2_HOME/bin/mvn "$@"
diff --git a/maven-script-rpmbuild b/maven-script-rpmbuild
index 3f3c1ae..f9058ad 100644
--- a/maven-script-rpmbuild
+++ b/maven-script-rpmbuild
@@ -42,6 +42,6 @@ echo $JAVA_HOME
 export JAVA_HOME
 # can't put it on command line due to
 # http://jira.codehaus.org/browse/SUREFIRE-121
-export MAVEN_OPTS="-Dmaven.local.mode ${local_add}"
+export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.local.mode ${local_add}"
 
 $M2_HOME/bin/mvn -o "$@"
diff --git a/maven.spec b/maven.spec
index 515150d..20847c8 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,7 +1,7 @@
 
 Name:           maven
 Version:        3.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java project management and project comprehension tool
 
 Group:          Development/Tools
@@ -308,6 +308,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %changelog
+* Mon Apr 18 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-2
+- Enable MAVEN_OPTS override in scripts
+
 * Fri Mar  4 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.3-1
 - Update to 3.0.3
 - Add ext subdirectory to lib