Author: pawelz Date: Tue Apr 27 16:36:00 2010 GMT
Module: packages Tag: JPACKAGE
---- Log message:
- tabs in preamble
- PLD-ized use of macros
---- Files affected:
packages/maven:
maven.spec (1.18.2.3 -> 1.18.2.4)
---- Diffs:
================================================================
Index: packages/maven/maven.spec
diff -u packages/maven/maven.spec:1.18.2.3 packages/maven/maven.spec:1.18.2.4
--- packages/maven/maven.spec:1.18.2.3 Tue Apr 27 18:19:46 2010
+++ packages/maven/maven.spec Tue Apr 27 18:35:54 2010
@@ -9,298 +9,303 @@
%define repo_dir m2_home_local/repository
%define maven_settings_file %{_builddir}/%{name}/settings.xml
-Name: maven
-Version: 2.0.8
-Release: 0.1
-Epoch: 0
-Summary: Java project management and project comprehension tool
-
-Group: Development/Build Tools
-License: Apache Software License
-URL: http://maven.apache.org/
+Name: maven
+Version: 2.0.8
+Release: %{bootstrap_release %rel}
+Summary: Java project management and project comprehension tool
+
+Group: Development/Languages/Java
+License: Apache v2
+URL: http://maven.apache.org/
# svn export
http://svn.apache.org/repos/asf/maven/components/tags/maven-%{version} maven2
# tar czf maven2-src.tar.gz maven2
-Source0: %{name}-src.tar.gz
+Source0: %{name}-src.tar.gz
# svn export -r {2007-03-31}
http://svn.apache.org/repos/asf/maven/plugins/trunk maven2-plugins
# tar czf maven2-plugins-070331-src.tar.gz maven2-plugins
-Source2: %{name}-plugins-070705-src.tar.gz
+Source2: %{name}-plugins-070705-src.tar.gz
# 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
maven-javadoc-plugin
-Source22: maven-javadoc-plugin-2.4-src.tar.gz
+Source22: maven-javadoc-plugin-2.4-src.tar.gz
# No source location for these. They are ascii files generated from maven
# repositories, and are not in cvs/svn
# The files were originally aquired from: http://repo1.maven.org/maven2/
-Source3: m2_pom_repo.tar.gz
+Source3: m2_pom_repo.tar.gz
# As with above, these files are from the maven repositories, and are not in
# cvs/svn
# The files were originally aquired from: http://repo1.maven.org/maven2/
-Source4: m2_jar_repo.tar.gz
-Source5: %{name}-script
+Source4: m2_jar_repo.tar.gz
+Source5: %{name}-script
-Source6: maven2-JPackageRepositoryLayout.java
-Source7: maven2-settings.xml
+Source6: maven2-JPackageRepositoryLayout.java
+Source7: maven2-settings.xml
# svn export -r '{2006-03-08}'
http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin
maven-site-plugin
# tar czf maven2-maven-site-plugin.tar.gz maven-site-plugin
-Source8: %{name}-maven-site-plugin.tar.gz
+Source8: %{name}-maven-site-plugin.tar.gz
-Source9: %{name}-run-it-tests.sh
+Source9: %{name}-run-it-tests.sh
# svn export
http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.8/maven-model
# cd maven-model
# mvn -P all-models package
# Find model jar in target/maven-model-2.0.8.jar
-Source10: %{name}-model-v3.jar
-Source11: %{name}-MavenJPackageDepmap.java
-Source12: %{name}-addjdom-depmap.xml
-Source13: %{name}-empty-dep.pom
+Source10: %{name}-model-v3.jar
+Source11: %{name}-MavenJPackageDepmap.java
+Source12: %{name}-addjdom-depmap.xml
+Source13: %{name}-empty-dep.pom
# Empty jar file with just a manifest. No source destination to specify
-Source14: %{name}-empty-dep.jar
-Source15: %{name}-jpp-script
-Source16: %{name}-jpp-readme.html
-Source17: %{name}-versionless-depmap.xml
-
-Source99: maven-doxia-modules.pom
-Source100: maven2-component-info.xml
-
-Patch0: maven2-addjdomtobootstrappath.patch
-Patch1: %{name}-jpprepolayout.patch
-Patch2: %{name}-fastjar-manifest-fix.patch
-Patch3: %{name}-plugins-doxiaupdatefix.patch
-Patch4: %{name}-plugins-catch-uncaught-exceptions.patch
-Patch5: %{name}-plugins-dependency-plugin-import-fix.patch
-Patch6: %{name}-%{version}-excludeexternaljars.patch
-Patch7: %{name}-site-plugin-addservletdep.patch
-Patch8: %{name}-enable-bootstrap-repository.patch
-Patch9: %{name}-use-unversioned-classworlds.patch
-Patch10: %{name}-plugins-disablecobertura.patch
-Patch11: %{name}-shade-plugin-replacement.patch
-Patch12: %{name}-sourcetarget.patch
-Patch13: %{name}-plugins-MJAVADOC-137-AbstractJavadocMojo.patch
+Source14: %{name}-empty-dep.jar
+Source15: %{name}-jpp-script
+Source16: %{name}-jpp-readme.html
+Source17: %{name}-versionless-depmap.xml
+
+Source99: maven-doxia-modules.pom
+Source100: maven2-component-info.xml
+
+Patch0: maven2-addjdomtobootstrappath.patch
+Patch1: %{name}-jpprepolayout.patch
+Patch2: %{name}-fastjar-manifest-fix.patch
+Patch3: %{name}-plugins-doxiaupdatefix.patch
+Patch4: %{name}-plugins-catch-uncaught-exceptions.patch
+Patch5: %{name}-plugins-dependency-plugin-import-fix.patch
+Patch6: %{name}-%{version}-excludeexternaljars.patch
+Patch7: %{name}-site-plugin-addservletdep.patch
+Patch8: %{name}-enable-bootstrap-repository.patch
+Patch9: %{name}-use-unversioned-classworlds.patch
+Patch10: %{name}-plugins-disablecobertura.patch
+Patch11: %{name}-shade-plugin-replacement.patch
+Patch12: %{name}-sourcetarget.patch
+Patch13: %{name}-plugins-MJAVADOC-137-AbstractJavadocMojo.patch
# The maven javadoc plugin 2.5 pre-reqs maven 2.0.9, we lower to 2.0.8
-Patch14: %{name}-javadoc-plugin-pom.patch
+Patch14: %{name}-javadoc-plugin-pom.patch
# javadoc 2.4 uses an old doxia method
-Patch15: %{name}-plugins-javadoc-newdoxia.patch
+Patch15: %{name}-plugins-javadoc-newdoxia.patch
# This plugin can't cope with a JAR without a JDK version on it
-Patch16: %{name}-plugins-project-info-reports-jdkversion.patch
-Patch17: %{name}-MNG-3139.patch
+Patch16: %{name}-plugins-project-info-reports-jdkversion.patch
+Patch17: %{name}-MNG-3139.patch
Patch18: %{name}-plugins-jpprepolayout.patch
Patch19: %{name}-plugins-disableenforcer.patch
-Patch20: %{name}-commons-cli-1.1.patch
+Patch20: %{name}-commons-cli-1.1.patch
-Provides: %{name}-bootstrap = %{epoch}:%{version}-%{release}
+Provides: %{name}-bootstrap = %{version}-%{release}
-BuildRequires: java-devel
-BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires:
/bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
-
-BuildRequires: ant >= 1.6.5
-BuildRequires: ant-nodeps
-BuildRequires: ant-junit
-BuildRequires: antlr >= 2.7.4
-BuildRequires: aqute-bndlib
-BuildRequires: bsh >= 1.3.0
-#BuildRequires: cglib >= 2.1.0
-BuildRequires: checkstyle4 >= 4.1
-BuildRequires: checkstyle4-optional >= 4.1
-BuildRequires: classworlds >= 1.1
-BuildRequires: dom4j >= 1.6.1
-#BuildRequires: tomcat5-parent
-BuildRequires: tomcat5-servlet-2.4-api
-BuildRequires: glassfish-javamail
-BuildRequires: gnu.regexp >= 1.1.4
-BuildRequires: httpunit >= 1.6
-BuildRequires: jakarta-commons-beanutils >= 1.7.0
-BuildRequires: jakarta-commons-cli >= 1.0
-BuildRequires: jakarta-commons-collections >= 3.1
-BuildRequires: jakarta-commons-io >= 1.1
-BuildRequires: jakarta-commons-lang >= 2.1
-BuildRequires: jakarta-commons-logging >= 1.0.4
-BuildRequires: jakarta-commons-validator >= 1.1.4
-BuildRequires: jaxen >= 1.1
-BuildRequires: jdom >= 1.0
-#BuildRequires: jmock >= 1.0.1
-BuildRequires: jline >= 0.8.1
-BuildRequires: jsch >= 0.1.20
-BuildRequires: jtidy >= 1.0
-BuildRequires: junit >= 3.8.2
-BuildRequires: maven2-common-poms >= 1.0-5
-BuildRequires: maven-jxr >= 1.0-2
-BuildRequires: maven-wagon >= 1.0-0.1.b2
-BuildRequires: maven-doxia >= 1.0-0.a9
-BuildRequires: nekohtml >= 0.9.3
-BuildRequires: oro >= 2.0.8
-BuildRequires: plexus-ant-factory >= 1.0-0.a1.2
-BuildRequires: plexus-bsh-factory >= 1.0-0.a7s.2
-BuildRequires: plexus-archiver >= 1.0-0.1.a8
-BuildRequires: plexus-compiler >= 1.5.1
-BuildRequires: plexus-container-default >= 1.0
-BuildRequires: plexus-i18n >= 1.0
-BuildRequires: plexus-interactivity >= 1.0
-BuildRequires: plexus-utils >= 1.2
-BuildRequires: plexus-velocity >= 1.1.2
-BuildRequires: pmd >= 3.6
-BuildRequires: qdox >= 1.5
-BuildRequires: rhino >= 1.5
-BuildRequires: saxon-scripts
-BuildRequires: saxpath
-BuildRequires: velocity >= 1.4
-BuildRequires: xerces-j2 >= 2.7.1
-BuildRequires: xalan-j2 >= 2.6.0
-BuildRequires: xmlrpc
-BuildRequires: xmlunit
-BuildRequires: xom
-
-%if %with itests
-BuildRequires: log4j >= 1.2.13
-BuildRequires: xml-commons-apis >= 1.3.02
-%endif
-
-%if %without bootstrap
-BuildRequires: %{name} = %{epoch}:%{version}
-BuildRequires: maven2-plugin-ant
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-clean
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-shade
-BuildRequires: maven2-plugin-site
-BuildRequires: maven2-plugin-surefire
-BuildRequires: maven-shared-archiver
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-embedder
-BuildRequires: maven-scm >= 0:1.0-0.b3.2
-BuildRequires: maven-scm-test >= 0:1.0-0.b3.2
-BuildRequires: maven-shared-common-artifact-filters
-BuildRequires: maven-shared-dependency-analyzer
-BuildRequires: maven-shared-dependency-tree
-BuildRequires: maven-shared-downloader
-BuildRequires: maven-shared-file-management >= 1.0
-BuildRequires: maven-shared-io
-BuildRequires: maven-shared-plugin-testing-harness >= 1.0
-BuildRequires: maven-shared-repository-builder
-BuildRequires: maven-shared-invoker
-BuildRequires: maven-shared-jar
-BuildRequires: maven-shared-model-converter
-BuildRequires: maven-shared-plugin-testing-tools
-BuildRequires: maven-shared-plugin-tools-api
-BuildRequires: maven-shared-plugin-tools-beanshell
-BuildRequires: maven-shared-plugin-tools-java
-BuildRequires: maven-shared-reporting-impl
-BuildRequires: maven-shared-verifier
-BuildRequires: maven-surefire >= 2.0
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-surefire-booter >= 2.0
-BuildRequires: modello >= 1.0-0.a8.3
-BuildRequires: modello-maven-plugin >= 1.0-0.a8.3
-BuildRequires: plexus-digest
-BuildRequires: plexus-maven-plugin >= 1.3.5
-BuildRequires: plexus-mail-sender
-BuildRequires: plexus-resources
-%endif
-
-Requires: ant >= 1.6.5
-Requires: antlr >= 2.7.4
-Requires: aqute-bndlib
-Requires: bsh >= 1.3.0
-#Requires: cglib >= 2.1.0
-Requires: checkstyle4 >= 4.1
-Requires: classworlds >= 1.
-Requires(post): classworlds >= 1.1
-Requires: dom4j >= 1.6.1
-#Requires: tomcat5-parent
-Requires: tomcat5-servlet-2.4-api
-Requires: glassfish-javamail
-Requires: gnu.regexp >= 1.1.4
-Requires: httpunit >= 1.6
-Requires: jakarta-commons-beanutils >= 1.7.0
-Requires: jakarta-commons-cli >= 1.0
-Requires(post): jakarta-commons-cli >= 1.0
-Requires: jakarta-commons-collections >= 3.1
-Requires: jakarta-commons-io >= 1.1
-Requires: jakarta-commons-lang >= 2.1
-Requires(post): jakarta-commons-lang >= 2.1
-Requires: jakarta-commons-logging >= 1.0.4
-Requires(post): jakarta-commons-logging >= 1.0.4
-Requires: jakarta-commons-validator >= 1.1.4
-Requires: jaxen >= 1.1
-Requires: jdom >= 1.0
-Requires(post): jdom >= 1.0
-#Requires: jmock >= 1.0.1
-Requires: jline >= 0.8.1
-Requires: jsch >= 0.1.20
-Requires(post): jsch >= 0.1.20
-Requires: jtidy >= 1.0
-Requires: junit >= 3.8.2
-Requires: maven2-common-poms >= 1.0-5
-Requires: maven-jxr >= 1.0
-Requires: maven-wagon >= 1.0-0.1.b2
-Requires(post): maven-wagon >= 1.0-0.1.b2
-Requires: nekohtml >= 0.9.3
-Requires: oro >= 2.0.8
-Requires: plexus-ant-factory >= 1.0-0.a1.2
-Requires: plexus-bsh-factory >= 1.0-0.a7s.2
-Requires: plexus-archiver >= 1.0-0.a6
-Requires: plexus-compiler >= 1.5.1
-Requires: plexus-container-default >= 1.0
-Requires(post): plexus-container-default >= 1.0
-Requires: plexus-i18n >= 1.0
-Requires: plexus-interactivity >= 1.0
-Requires(post): plexus-interactivity >= 1.0
-Requires: plexus-utils >= 1.2
-Requires(post): plexus-utils >= 1.2
-Requires: plexus-velocity >= 1.1.2
-Requires: pmd >= 3.6
-Requires: qdox >= 1.5
-Requires: rhino >= 1.5
-Requires: velocity >= 1.4
-Requires: xerces-j2 >= 2.7.1
-Requires: xalan-j2 >= 2.6.0
-Requires: xmlrpc
-Requires: xmlunit
-Requires: xom
-
-%if %without bootstrap
-Requires: %{name} = %{epoch}:%{version}
-Requires: maven-doxia >= 1.0-0.a9
-Requires(post): maven-doxia >= 1.0-0.a9
-Requires: maven-scm >= 0:1.0-0.b3.2
-Requires: maven-scm-test >= 0:1.0-0.b3.2
-Requires: maven-shared-invoker
-Requires: maven-shared-io
-Requires: maven-shared-file-management >= 1.0-4
-Requires: maven-shared-jar
-Requires: maven-shared-model-converter
-Requires: maven-shared-verifier
-Requires: maven-surefire >= 2.0
-Requires: maven-surefire-booter >= 2.0
-Requires: modello >= 1.0-0.a8.3
-Requires: modello-maven-plugin >= 1.0-0.a8.3
-%endif
-
-Obsoletes: maven2-plugin-jxr <= 0:2.0.4
-Obsoletes: maven2-plugin-surefire <= 0:2.0.4
-Obsoletes: maven2-plugin-surefire-report <= 0:2.0.4
-Obsoletes: maven2-plugin-release <= 0:2.0.4
-Obsoletes: maven2-plugin-enforcer < %{epoch}:%{version}-%{release}
+### PLDIZED DEPENDENCIES {{{
+BuildRequires: rpmbuild(macros) >= 1.557
+### END OF PLDIZED DEPENDENCIES }}}
+
+### OLD JPP DEPENDENCIES {{{
+BuildRequires: java-devel
+BuildRequires: jpackage-utils >= 0:1.7.2
+BuildRequires:
/bin/ls,/usr/bin/head,/usr/bin/find,/usr/bin/awk,/bin/grep,/bin/sed
+
+BuildRequires: ant >= 1.6.5
+BuildRequires: ant-nodeps
+BuildRequires: ant-junit
+BuildRequires: antlr >= 2.7.4
+BuildRequires: aqute-bndlib
+BuildRequires: bsh >= 1.3.0
+#BuildRequires: cglib >= 2.1.0
+BuildRequires: checkstyle4 >= 4.1
+BuildRequires: checkstyle4-optional >= 4.1
+BuildRequires: classworlds >= 1.1
+BuildRequires: dom4j >= 1.6.1
+#BuildRequires: tomcat5-parent
+BuildRequires: tomcat5-servlet-2.4-api
+BuildRequires: glassfish-javamail
+BuildRequires: gnu.regexp >= 1.1.4
+BuildRequires: httpunit >= 1.6
+BuildRequires: jakarta-commons-beanutils >= 1.7.0
+BuildRequires: jakarta-commons-cli >= 1.0
+BuildRequires: jakarta-commons-collections >= 3.1
+BuildRequires: jakarta-commons-io >= 1.1
+BuildRequires: jakarta-commons-lang >= 2.1
+BuildRequires: jakarta-commons-logging >= 1.0.4
+BuildRequires: jakarta-commons-validator >= 1.1.4
+BuildRequires: jaxen >= 1.1
+BuildRequires: jdom >= 1.0
+#BuildRequires: jmock >= 1.0.1
+BuildRequires: jline >= 0.8.1
+BuildRequires: jsch >= 0.1.20
+BuildRequires: jtidy >= 1.0
+BuildRequires: junit >= 3.8.2
+BuildRequires: maven2-common-poms >= 1.0-5
+BuildRequires: maven-jxr >= 1.0-2
+BuildRequires: maven-wagon >= 1.0-0.1.b2
+BuildRequires: maven-doxia >= 1.0-0.a9
+BuildRequires: nekohtml >= 0.9.3
+BuildRequires: oro >= 2.0.8
+BuildRequires: plexus-ant-factory >= 1.0-0.a1.2
+BuildRequires: plexus-bsh-factory >= 1.0-0.a7s.2
+BuildRequires: plexus-archiver >= 1.0-0.1.a8
+BuildRequires: plexus-compiler >= 1.5.1
+BuildRequires: plexus-container-default >= 1.0
+BuildRequires: plexus-i18n >= 1.0
+BuildRequires: plexus-interactivity >= 1.0
+BuildRequires: plexus-utils >= 1.2
+BuildRequires: plexus-velocity >= 1.1.2
+BuildRequires: pmd >= 3.6
+BuildRequires: qdox >= 1.5
+BuildRequires: rhino >= 1.5
+BuildRequires: saxon-scripts
+BuildRequires: saxpath
+BuildRequires: velocity >= 1.4
+BuildRequires: xerces-j2 >= 2.7.1
+BuildRequires: xalan-j2 >= 2.6.0
+BuildRequires: xmlrpc
+BuildRequires: xmlunit
+BuildRequires: xom
+
+%if %{with itests}
+BuildRequires: log4j >= 1.2.13
+BuildRequires: xml-commons-apis >= 1.3.02
+%endif
+
+%if %{without bootstrap}
+BuildRequires: %{name} = %{version}
+BuildRequires: maven2-plugin-ant
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven2-plugin-clean
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-plugin
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven2-plugin-shade
+BuildRequires: maven2-plugin-site
+BuildRequires: maven2-plugin-surefire
+BuildRequires: maven-shared-archiver
+BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-embedder
+BuildRequires: maven-scm >= 0:1.0-0.b3.2
+BuildRequires: maven-scm-test >= 0:1.0-0.b3.2
+BuildRequires: maven-shared-common-artifact-filters
+BuildRequires: maven-shared-dependency-analyzer
+BuildRequires: maven-shared-dependency-tree
+BuildRequires: maven-shared-downloader
+BuildRequires: maven-shared-file-management >= 1.0
+BuildRequires: maven-shared-io
+BuildRequires: maven-shared-plugin-testing-harness >= 1.0
+BuildRequires: maven-shared-repository-builder
+BuildRequires: maven-shared-invoker
+BuildRequires: maven-shared-jar
+BuildRequires: maven-shared-model-converter
+BuildRequires: maven-shared-plugin-testing-tools
+BuildRequires: maven-shared-plugin-tools-api
+BuildRequires: maven-shared-plugin-tools-beanshell
+BuildRequires: maven-shared-plugin-tools-java
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-shared-verifier
+BuildRequires: maven-surefire >= 2.0
+BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-surefire-booter >= 2.0
+BuildRequires: modello >= 1.0-0.a8.3
+BuildRequires: modello-maven-plugin >= 1.0-0.a8.3
+BuildRequires: plexus-digest
+BuildRequires: plexus-maven-plugin >= 1.3.5
+BuildRequires: plexus-mail-sender
+BuildRequires: plexus-resources
+%endif
+
+Requires: ant >= 1.6.5
+Requires: antlr >= 2.7.4
+Requires: aqute-bndlib
+Requires: bsh >= 1.3.0
+#Requires: cglib >= 2.1.0
+Requires: checkstyle4 >= 4.1
+Requires: classworlds >= 1.
+Requires(post): classworlds >= 1.1
+Requires: dom4j >= 1.6.1
+#Requires: tomcat5-parent
+Requires: tomcat5-servlet-2.4-api
+Requires: glassfish-javamail
+Requires: gnu.regexp >= 1.1.4
+Requires: httpunit >= 1.6
+Requires: jakarta-commons-beanutils >= 1.7.0
+Requires: jakarta-commons-cli >= 1.0
+Requires(post): jakarta-commons-cli >= 1.0
+Requires: jakarta-commons-collections >= 3.1
+Requires: jakarta-commons-io >= 1.1
+Requires: jakarta-commons-lang >= 2.1
+Requires(post): jakarta-commons-lang >= 2.1
+Requires: jakarta-commons-logging >= 1.0.4
+Requires(post): jakarta-commons-logging >= 1.0.4
+Requires: jakarta-commons-validator >= 1.1.4
+Requires: jaxen >= 1.1
+Requires: jdom >= 1.0
+Requires(post): jdom >= 1.0
+#Requires: jmock >= 1.0.1
+Requires: jline >= 0.8.1
+Requires: jsch >= 0.1.20
+Requires(post): jsch >= 0.1.20
+Requires: jtidy >= 1.0
+Requires: junit >= 3.8.2
+Requires: maven2-common-poms >= 1.0-5
+Requires: maven-jxr >= 1.0
+Requires: maven-wagon >= 1.0-0.1.b2
+Requires(post): maven-wagon >= 1.0-0.1.b2
+Requires: nekohtml >= 0.9.3
+Requires: oro >= 2.0.8
+Requires: plexus-ant-factory >= 1.0-0.a1.2
+Requires: plexus-bsh-factory >= 1.0-0.a7s.2
+Requires: plexus-archiver >= 1.0-0.a6
+Requires: plexus-compiler >= 1.5.1
+Requires: plexus-container-default >= 1.0
+Requires(post): plexus-container-default >= 1.0
+Requires: plexus-i18n >= 1.0
+Requires: plexus-interactivity >= 1.0
+Requires(post): plexus-interactivity >= 1.0
+Requires: plexus-utils >= 1.2
+Requires(post): plexus-utils >= 1.2
+Requires: plexus-velocity >= 1.1.2
+Requires: pmd >= 3.6
+Requires: qdox >= 1.5
+Requires: rhino >= 1.5
+Requires: velocity >= 1.4
+Requires: xerces-j2 >= 2.7.1
+Requires: xalan-j2 >= 2.6.0
+Requires: xmlrpc
+Requires: xmlunit
+Requires: xom
+
+%if %{without bootstrap}
+Requires: %{name} = %{version}
+Requires: maven-doxia >= 1.0-0.a9
+Requires(post): maven-doxia >= 1.0-0.a9
+Requires: maven-scm >= 0:1.0-0.b3.2
+Requires: maven-scm-test >= 0:1.0-0.b3.2
+Requires: maven-shared-invoker
+Requires: maven-shared-io
+Requires: maven-shared-file-management >= 1.0-4
+Requires: maven-shared-jar
+Requires: maven-shared-model-converter
+Requires: maven-shared-verifier
+Requires: maven-surefire >= 2.0
+Requires: maven-surefire-booter >= 2.0
+Requires: modello >= 1.0-0.a8.3
+Requires: modello-maven-plugin >= 1.0-0.a8.3
+%endif
+
+Obsoletes: maven2-plugin-jxr <= 0:2.0.4
+Obsoletes: maven2-plugin-surefire <= 0:2.0.4
+Obsoletes: maven2-plugin-surefire-report <= 0:2.0.4
+Obsoletes: maven2-plugin-release <= 0:2.0.4
+Obsoletes: maven2-plugin-enforcer < %{version}-%{release}
+
+Requires(post): jpackage-utils >= 0:1.7.2
+Requires(postun): jpackage-utils >= 0:1.7.2, /bin/rmdir
+### END OF OLD JPP DEPENDENCIES }}}
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2, /bin/rmdir
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildArch: noarch
+BuildArch: noarch
%description
Maven is a software project management and comprehension tool. Based on the
@@ -308,184 +313,184 @@
reporting and documentation from a central piece of information.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Development/Documentation
-Requires(post): /bin/rm,/bin/ln
-Requires(postun): /bin/rm
+Summary: Javadoc for %{name}
+Group: Development/Documentation
+Requires(post): /bin/rm,/bin/ln
+Requires(postun): /bin/rm
%description javadoc
%{summary}.
%package manual
-Summary: Documents for %{name}
-Group: Development/Documentation
+Summary: Documents for %{name}
+Group: Development/Documentation
%description manual
%{summary}.
%package plugin-ant
-Summary: Ant plugin for maven
-Group: Development/Build Tools
-Requires: ant >= 1.6.5
-Requires: ant-junit
-Requires: ant-nodeps
-Requires: junit >= 3.8.2
-Requires: maven-wagon >= 1.0-0.1.b2
-Requires: plexus-utils >= 1.2
-Requires: xalan-j2 >= 2.6.0
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/maven/maven.spec?r1=1.18.2.3&r2=1.18.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
