rpms/maven2/devel maven2-commons-cli-1.1.patch, NONE, 1.1 maven2.spec, 1.15, 1.16

[Deepak Bhole]

Author: dbhole

Update of /cvs/extras/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20146

Modified Files:
	maven2.spec 
Added Files:
	maven2-commons-cli-1.1.patch 
Log Message:

- Add patch so that multiple properties can be specified with commons-cli 1.1



maven2-commons-cli-1.1.patch:

--- NEW FILE maven2-commons-cli-1.1.patch ---
diff -up ./maven2/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java.sav ./maven2/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
--- ./maven2/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java.sav	2009-01-29 16:47:45.000000000 -0500
+++ ./maven2/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java	2009-01-29 16:48:00.000000000 -0500
@@ -645,7 +645,7 @@ public class MavenCli
                 "Force the use of an alternate POM file." ).create( ALTERNATE_POM_FILE ) );
 
             options.addOption(
-                OptionBuilder.withLongOpt( "define" ).hasArg().withDescription( "Define a system property" ).create(
+                OptionBuilder.withLongOpt( "define" ).hasArgs(1).withDescription( "Define a system property" ).create(
                     SET_SYSTEM_PROPERTY ) );
             options.addOption(
                 OptionBuilder.withLongOpt( "offline" ).withDescription( "Work offline" ).create( OFFLINE ) );


Index: maven2.spec
===================================================================
RCS file: /cvs/extras/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- maven2.spec	25 Feb 2009 23:52:39 -0000	1.15
+++ maven2.spec	26 Feb 2009 20:50:57 -0000	1.16
@@ -50,7 +50,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        11.15%{?dist}
+Release:        11.16%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -111,6 +111,7 @@
 Patch8:          %{name}-noexternaljavadoclinks.patch 
 Patch9:          %{name}-ant17.patch
 Patch10:         %{name}-MNG-3118.patch
+Patch11:         %{name}-commons-cli-1.1.patch
 
 BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
@@ -926,6 +927,7 @@
 %patch8 -b .sav
 %patch9 -b .sav
 %patch10 -b .sav
+%patch11 -b .sav
 
 # FIXME: Maven eclipse plugin tests are disabled for now, until a way
 # is found to stop it from connecting to the web despite offline mode.
@@ -2297,6 +2299,9 @@
 %endif
 
 %changelog
+* Thu Feb 26 2009 Deepak Bhole <dbhole at redhat.com> - 0:2.0.4-11.16
+- Add patch so that multiple properties can be specified with commons-cli 1.1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0.4-11.15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild