rpms/maven2/devel maven2-ant17.patch,NONE,1.1 maven2.spec,1.4,1.5

[Deepak Bhole (dbhole)]

Author: dbhole

Update of /cvs/extras/rpms/maven2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26178

Modified Files:
	maven2.spec 
Added Files:
	maven2-ant17.patch 
Log Message:

- Exclude ppc64 build
- Add patch to build with ant 1.7
- Build with bootstrap (First build on F8/ppc)



maven2-ant17.patch:

--- NEW FILE maven2-ant17.patch ---
--- ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java.sav	2007-08-29 17:02:14.000000000 -0400
+++ ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/LocalRepository.java	2007-08-29 17:02:20.000000000 -0400
@@ -29,7 +29,7 @@ public class LocalRepository
 {
     private File location;
 
-    public File getLocation()
+    public File getFileLocation()
     {
         return ( (LocalRepository) getInstance() ).location;
     }
--- ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java.sav	2007-08-29 17:02:44.000000000 -0400
+++ ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java	2007-08-29 17:02:59.000000000 -0400
@@ -188,7 +188,7 @@ public class DependenciesTask
         }
 
         FileList fileList = new FileList();
-        fileList.setDir( getLocalRepository().getLocation() );
+        fileList.setDir( getLocalRepository().getFileLocation() );
 
         FileSet fileSet = new FileSet();
         fileSet.setDir( fileList.getDir( getProject() ) );
--- ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java.sav	2007-08-29 17:03:09.000000000 -0400
+++ ./maven2/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java	2007-08-29 17:03:19.000000000 -0400
@@ -78,7 +78,7 @@ public abstract class AbstractArtifactTa
         ArtifactRepositoryLayout repositoryLayout =
             (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, localRepository.getLayout() );
 
-        return new DefaultArtifactRepository( "local", "file://" + localRepository.getLocation(), repositoryLayout );
+        return new DefaultArtifactRepository( "local", "file://" + localRepository.getFileLocation(), repositoryLayout );
     }
 
     protected ArtifactRepository createRemoteArtifactRepository( RemoteRepository repository )


Index: maven2.spec
===================================================================
RCS file: /cvs/extras/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven2.spec	20 Mar 2007 06:58:29 -0000	1.4
+++ maven2.spec	7 Sep 2007 20:30:20 -0000	1.5
@@ -34,6 +34,7 @@
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
 %define without_itests %{?_with_itests:0}%{!?_with_itests:1}
 
+%define _with_bootstrap 1
 %define with_bootstrap %{!?_with_bootstrap:0}%{?_with_bootstrap:1}
 %define without_bootstrap %{?_with_bootstrap:0}%{!?_with_bootstrap:1}
 
@@ -107,6 +108,7 @@
 Patch6:          %{name}-enable-unbuilt-modules.patch
 Patch7:          %{name}-fastjar-manifest-fix.patch
 Patch8:          %{name}-noexternaljavadoclinks.patch 
+Patch9:          %{name}-ant17.patch
 
 BuildRequires:    jpackage-utils >= 0:1.7.2
 BuildRequires:    /bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
@@ -273,6 +275,7 @@
 BuildRequires:       java-gcj-compat-devel
 Requires(post):      java-gcj-compat
 Requires(postun):    java-gcj-compat
+ExcludeArch:         ppc64
 %endif
 
 %description
@@ -920,6 +923,7 @@
 %patch6 -b .sav
 %patch7 -b .sav
 %patch8 -b .sav
+%patch9 -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.
@@ -2291,6 +2295,11 @@
 %endif
 
 %changelog
+* Fri Sep 07 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.7
+- Exclude ppc64 build
+- Add patch to build with ant 1.7
+- Build with bootstrap (First build on F8/ppc)
+
 * Tue Mar 20 2007 Deepak Bhole <dbhole at redhat.com> 0:2.0.4-10jpp.6
 - Build without bootstrap