Author: pawelz Date: Thu Apr 29 13:51:11 2010 GMT
Module: packages Tag: JPACKAGE
---- Log message:
- reverted small part of previous commit
- %prep ends with no error now :)))
---- Files affected:
packages/maven:
maven.spec (1.18.2.11 -> 1.18.2.12)
---- Diffs:
================================================================
Index: packages/maven/maven.spec
diff -u packages/maven/maven.spec:1.18.2.11 packages/maven/maven.spec:1.18.2.12
--- packages/maven/maven.spec:1.18.2.11 Thu Apr 29 15:38:17 2010
+++ packages/maven/maven.spec Thu Apr 29 15:51:05 2010
@@ -1004,7 +1004,7 @@
%endif
# Copy model-v3
-cp -p %{SOURCE10} m2_repo/repository/JPP/maven/model-v3.jar
+cp -p %{SOURCE10} m2_repo/repository/JPP/maven2/model-v3.jar
mkdir external_repo
ln -s %{_javadir} external_repo/JPP
@@ -1035,9 +1035,9 @@
%endif
# Copy the empty dependency jar/pom in place
-mkdir -p m2_repo/repository/JPP/maven/default_poms
-cp -p %{SOURCE13}
m2_repo/repository/JPP/maven/default_poms/JPP.maven-empty-dep.pom
-cp -p %{SOURCE14} m2_repo/repository/JPP/maven/empty-dep.jar
+mkdir -p m2_repo/repository/JPP/maven2/default_poms
+cp -p %{SOURCE13}
m2_repo/repository/JPP/maven2/default_poms/JPP.maven-empty-dep.pom
+cp -p %{SOURCE14} m2_repo/repository/JPP/maven2/empty-dep.jar
%build
# Fix maven-remote-resources-plugin
@@ -1047,7 +1047,7 @@
# Wire in jdom dependency
cp -p maven/maven-artifact/pom.xml maven/maven-artifact/pom.xml.withoutjdom
saxon -o maven/maven-artifact/pom.xml maven/maven-artifact/pom.xml.withoutjdom
/usr/share/java-utils/xml/mavenjpp-mapdeps.xsl map=%{SOURCE12}
-saxon -o m2_repo/repository/JPP/maven/poms/JPP.maven-artifact.pom
maven/maven-artifact/pom.xml.withoutjdom
/usr/share/java-utils/xml/mavenjpp-mapdeps.xsl map=%{SOURCE12}
+saxon -o m2_repo/repository/JPP/maven2/poms/JPP.maven2-artifact.pom
maven/maven-artifact/pom.xml.withoutjdom
/usr/share/java-utils/xml/mavenjpp-mapdeps.xsl map=%{SOURCE12}
# for uber jar
cp -p maven/maven-core/pom.xml maven/maven-core/pom.xml.withoutjdom
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/maven/maven.spec?r1=1.18.2.11&r2=1.18.2.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
