From 80e82552654dfeb2ac0b87cd60dd7294a4f23e77 Mon Sep 17 00:00:00 2001 From: Sami Wagiaalla Date: Nov 28 2011 23:48:59 +0000 Subject: Use mvn-rpmbuild. * Mon Nov 28 2011 Sami Wagiaalla - Use mvn-rpmbuild. - Change the depmaps flag. - Use BR maven istead of maven2. --- diff --git a/xmlrpc3.spec b/xmlrpc3.spec index c63870a..68c52cc 100644 --- a/xmlrpc3.spec +++ b/xmlrpc3.spec @@ -32,7 +32,7 @@ Name: xmlrpc3 Version: 3.1.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java XML-RPC implementation License: ASL 2.0 Group: Development/Libraries @@ -47,7 +47,7 @@ Patch0: %{name}-addjunitandservletapitotestpom.patch Patch1: %{name}-client-addosgimanifest.patch Patch2: %{name}-common-addosgimanifest.patch -BuildRequires: maven2 >= 2.0.4 +BuildRequires: maven BuildRequires: maven-resources-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-surefire-plugin @@ -137,10 +137,9 @@ sed -i 's/\r//' LICENSE.txt export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository mkdir -p $MAVEN_REPO_LOCAL # ignore test failure because server part needs network -mvn-jpp \ +mvn-rpmbuild \ -e \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven2.jpp.depmap.file=%{SOURCE1} \ + -Dmaven.local.depmap.file=%{SOURCE1} \ -Dmaven.test.failure.ignore=true \ install javadoc:aggregate @@ -207,6 +206,11 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadir}/%{name}-server.jar %changelog +* Mon Nov 28 2011 Sami Wagiaalla - 3.1.3-6 +- Use mvn-rpmbuild. +- Change the depmaps flag. +- Use BR maven istead of maven2. + * Mon Feb 07 2011 Fedora Release Engineering - 3.1.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild