rpms/maven2/devel .cvsignore, 1.5, 1.6 maven2-plugins-javadoc-newdoxia.patch, 1.1, 1.2 maven2.spec, 1.22, 1.23 sources, 1.5, 1.6

[Andrew Overholt]

Author: overholt

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

Modified Files:
	.cvsignore maven2-plugins-javadoc-newdoxia.patch maven2.spec 
	sources 
Log Message:
* Tue Aug 25 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.3
- Fix javadoc source directory name
- Don't try to symlink model-all JAR


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	25 Aug 2009 16:02:26 -0000	1.5
+++ .cvsignore	25 Aug 2009 17:22:48 -0000	1.6
@@ -1,8 +1 @@
-m2_jar_repo.tar.gz
-m2_pom_repo.tar.gz
-maven2-empty-dep.jar
-maven2-maven-site-plugin.tar.gz
-maven2-model-v3.jar
-maven2-src.tar.gz
-maven2-plugins-070705-src.tar.gz
 maven-javadoc-plugin-2.4-src.tar.gz

maven2-plugins-javadoc-newdoxia.patch:
 JavadocReport.java |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

Index: maven2-plugins-javadoc-newdoxia.patch
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2-plugins-javadoc-newdoxia.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- maven2-plugins-javadoc-newdoxia.patch	24 Aug 2009 19:12:57 -0000	1.1
+++ maven2-plugins-javadoc-newdoxia.patch	25 Aug 2009 17:22:48 -0000	1.2
@@ -1,5 +1,5 @@
---- maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.orig	2009-01-31 12:28:40.393331000 -0500
-+++ maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2009-01-31 18:17:01.921601000 -0500
+--- maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java.orig	2009-01-31 12:28:40.393331000 -0500
++++ maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java	2009-01-31 18:17:01.921601000 -0500
 @@ -26,6 +26,7 @@
  import org.apache.maven.plugin.MojoFailureException;
  import org.apache.maven.reporting.MavenReport;


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- maven2.spec	24 Aug 2009 19:12:57 -0000	1.22
+++ maven2.spec	25 Aug 2009 17:22:48 -0000	1.23
@@ -46,7 +46,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        1.2%{?dist}
+Release:        1.3%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -64,8 +64,8 @@ Source2:        %{name}-plugins-070705-s
 
 # We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above 
 # has several bugs
-# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4
-# tar czf maven-javadoc-plugin-2.4-src.tar.gz maven-javadoc-plugin-2.4
+# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4 maven-javadoc-plugin
+# tar czf maven-javadoc-plugin-2.4-src.tar.gz maven-javadoc-plugin
 Source22: maven-javadoc-plugin-2.4-src.tar.gz
 
 # No source location for these. They are ascii files generated from maven
@@ -1196,7 +1196,7 @@ popd
 for i in    maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java \
             maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java \
             maven2-plugins/maven-changelog-plugin/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java \
-            maven2-plugins/maven-javadoc-plugin-2.4/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
+            maven2-plugins/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocReport.java \
             maven2-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java \
             maven2/maven-reporting/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReport.java \
             maven2-plugins/maven-antlr-plugin/src/main/java/org/apache/maven/plugin/antlr/AntlrHtmlReport.java \
@@ -1540,9 +1540,10 @@ pushd %{name}
 
         install -m 644 $project/target/$project-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-%{version}.jar
 
-        if [ "$project" == "maven-model" ]; then
-          install -m 644 $project/target/$project-%{version}-all.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-all-%{version}.jar
-        fi
+# FIXME:  should perhaps only be done when non-bootstrap?
+#        if [ "$project" == "maven-model" ]; then
+#          install -m 644 $project/target/$project-%{version}-all.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$artifactname-all-%{version}.jar
+#        fi
     done
 popd
 
@@ -2868,6 +2869,10 @@ fi
 %endif
 
 %changelog
+* Tue Aug 25 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.3
+- Fix javadoc source directory name
+- Don't try to symlink model-all JAR
+
 * Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.2
 - Import 2.0.8 work from Deepak Bhole:
 -- Fix maven-remote-resources-plugin


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	25 Aug 2009 16:02:26 -0000	1.5
+++ sources	25 Aug 2009 17:22:48 -0000	1.6
@@ -1,8 +1 @@
-dc36ce1fbefedbdd27fa93c8584ba91a  maven2-empty-dep.jar
-de45a278b88554bb545f092e2f82c56d  maven2-maven-site-plugin.tar.gz
-13c1088b7b9535b9e4fb31317f79491a  maven2-model-v3.jar
-a9b9ce42ffbba60eb1833f0a773f7aa7  maven2-plugins-070705-src.tar.gz
-ffd6fcb439b5b7e143a31a4fd5af9902  maven2-src.tar.gz
-b94d6c2bd76523470a39ff7083a253bd  m2_jar_repo.tar.gz
-e1dcb37943da8c0f1767891f00f6dc44  m2_pom_repo.tar.gz
-7e6b7b8d83ae3498fe2c55a999278445  maven-javadoc-plugin-2.4-src.tar.gz
+cf287f9dceb51c21af5da92ff83a6b52  maven-javadoc-plugin-2.4-src.tar.gz