rpms/plexus-containers/devel plexus-containers.spec, 1.1.2.1, 1.1.2.2

[Fernando Nasser]

Author: fnasser

Update of /cvs/extras/rpms/plexus-containers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12426

Modified Files:
      Tag: private-newmaven-branch
	plexus-containers.spec 
Log Message:
Adaptation to our current maven set


Index: plexus-containers.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-containers/devel/Attic/plexus-containers.spec,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.1 -r1.1.2.2
--- plexus-containers.spec	20 May 2009 13:59:15 -0000	1.1.2.1
+++ plexus-containers.spec	20 May 2009 14:10:44 -0000	1.1.2.2
@@ -27,6 +27,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+
+%define _without_gcj_support 1
+
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 
@@ -64,15 +67,16 @@ BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.7.3
 %if %{with_maven}
-BuildRequires:  maven2 >= 2.0.4-10jpp
+BuildRequires:  maven2 >= 2.0.4
 BuildRequires:	maven2-plugin-compiler
 BuildRequires:	maven2-plugin-install
 BuildRequires:	maven2-plugin-jar
 BuildRequires:	maven2-plugin-javadoc
 BuildRequires:	maven2-plugin-resources
-BuildRequires:	maven2-plugin-surefire
+#BuildRequires:	maven2-plugin-surefire
+BuildRequires:	maven-surefire-plugin
 BuildRequires:	maven2-common-poms >= 1.0
-BuildRequires:	maven-release
+#BuildRequires:	maven-release
 %else
 BuildRequires:  ant >= 0:1.6.5
 BuildRequires:  ant-junit