rpms/maven2/devel maven2.spec,1.25,1.26

[Andrew Overholt]

Author: overholt

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

Modified Files:
	maven2.spec 
Log Message:
* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-2
- Build in non-bootstrap mode
- Change jmock R to easymock for plugin-assembly


Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- maven2.spec	31 Aug 2009 14:51:15 -0000	1.25
+++ maven2.spec	1 Sep 2009 19:30:11 -0000	1.26
@@ -32,8 +32,8 @@
 
 %define with_itests %{!?_with_itests:0}%{?_with_itests:1}
 
-%define with_bootstrap 1
-%define without_bootstrap 0
+%define with_bootstrap 0
+%define without_bootstrap 1
 
 %define maven_version   2.0.8
 %define NONFREE 0
@@ -46,7 +46,7 @@
 
 Name:           %{name}
 Version:        %{maven_version}
-Release:        1.4%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Java project management and project comprehension tool
 
@@ -172,7 +172,6 @@ BuildRequires:    plexus-container-defau
 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
@@ -208,6 +207,8 @@ BuildRequires:    maven2-plugin-resource
 BuildRequires:    maven2-plugin-shade
 BuildRequires:    maven2-plugin-site
 BuildRequires:    maven2-plugin-surefire
+BuildRequires:    maven-archiver >= 2.2
+BuildRequires:    maven-plugin-tools >= 2.1
 BuildRequires:    maven-shared-archiver
 BuildRequires:    maven-doxia-sitetools
 BuildRequires:    maven-embedder
@@ -236,10 +237,14 @@ BuildRequires:    maven-surefire-provide
 BuildRequires:    maven-surefire-booter >= 2.0
 BuildRequires:    modello >= 1.0-0.a8.3
 BuildRequires:    modello-maven-plugin >= 1.0-0.a8.3
+BuildRequires:    plexus-cdc >= 1.0-0.5.a10
 BuildRequires:    plexus-digest
 BuildRequires:    plexus-maven-plugin >= 1.3.5
 BuildRequires:    plexus-mail-sender
 BuildRequires:    plexus-resources
+BuildRequires:    plexus-velocity >= 1.1.7
+%else
+BuildRequires:    plexus-velocity >= 1.1.2
 %endif
 
 Requires:        ant >= 1.6.5
@@ -438,7 +443,6 @@ Requires(postun): maven2 = %{epoch}:%{ve
 %if %{without_bootstrap}
 Requires:       modello >= 1.0-0.a8.3
 Requires:    	maven-shared-archiver
-Requires:       jmock >= 1.0.1
 Requires:	maven-shared-test-tools
 Requires:    	maven-shared-repository-builder
 Requires:    	maven-shared-common-artifact-filters
@@ -450,6 +454,7 @@ Requires:    	maven-shared-file-manageme
 Requires:	plexus-container-default
 Requires:       jdom >= 1.0
 Requires:       jaxen >= 1.1
+Requires:       easymock
 Requires:    	saxpath
 Requires:       junit >= 3.8.2
 
@@ -493,12 +498,14 @@ Requires:       maven-doxia
 Requires:       maven-doxia-sitetools >= 1.0
 Requires:    	maven-shared-reporting-impl
 Requires:       glassfish-javamail
+Requires:       plexus-velocity >= 1.1.7
+%else
+Requires:       plexus-velocity >= 1.1.2
 %endif
 Requires:       maven2 = %{epoch}:%{version}-%{release}
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       velocity
 Requires:       commons-httpclient
-Requires:       plexus-velocity >= 1.1.2
 Requires:       plexus-mail-sender
 Requires:       jakarta-commons-lang
 Requires:       velocity
@@ -691,6 +698,7 @@ Requires:       maven2 = %{epoch}:%{vers
 Requires(postun): maven2 = %{epoch}:%{version}-%{release}
 Requires:       plexus-utils >= 1.2
 %if %{without_bootstrap}
+Requires:       maven-archiver >= 2.2
 Requires:       maven-shared-verifier
 %endif
 Requires:       xmlunit
@@ -2898,6 +2906,10 @@ fi
 %endif
 
 %changelog
+* Tue Sep 01 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-2
+- Build in non-bootstrap mode
+- Change jmock R to easymock for plugin-assembly
+
 * Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0.8-1.4
 - Move missing dependencies to without_bootstrap blocks.