Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Sami Wagiaalla
9b8ac480a4 Use mvn-rpmbuild.
* Mon Nov 28 2011 Sami Wagiaalla
- Use mvn-rpmbuild.
- Change the depmaps flag.
- Use BR maven istead of maven2.
- Add BR maven-surefire-provider-junit.
2011-11-28 18:46:10 -05:00

View file

@ -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
@ -58,6 +58,7 @@ BuildRequires: maven-eclipse-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: ws-jaxme
BuildRequires: ws-commons-util
BuildRequires: jpackage-utils >= 0:1.6
@ -137,10 +138,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 +207,12 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadir}/%{name}-server.jar
%changelog
* Mon Nov 28 2011 Sami Wagiaalla <swagiaal@redhat.com> - 3.1.3-6
- Use mvn-rpmbuild.
- Change the depmaps flag.
- Use BR maven istead of maven2.
- Add BR maven-surefire-provider-junit.
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild