diff --git a/maven-plugin-testing-depmap.xml b/maven-plugin-testing-depmap.xml new file mode 100644 index 0000000..ef5c89f --- /dev/null +++ b/maven-plugin-testing-depmap.xml @@ -0,0 +1,15 @@ + + + + org.apache.maven + maven-archiver + 2.4 + + + JPP + maven-archiver + 2.4 + + + + diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec index 331d541..fcff908 100644 --- a/maven-plugin-testing.spec +++ b/maven-plugin-testing.spec @@ -1,6 +1,6 @@ Name: maven-plugin-testing Version: 1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Maven Plugin Testing Group: Development/Libraries @@ -9,6 +9,7 @@ URL: http://maven.apache.org/plugin-testing/ #svn export http://svn.apache.org/repos/asf/maven/plugin-testing/tags/maven-plugin-testing-1.2 maven-plugin-testing-1.2 #tar caf maven-plugin-testing-1.2 maven-plugin-testing-1.2/ Source0: %{name}-%{version}.tar.xz +Source1: %{name}-depmap.xml BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,7 +27,7 @@ BuildRequires: maven-doxia-sitetools BuildRequires: maven-surefire-maven-plugin BuildRequires: maven-surefire-provider-junit BuildRequires: maven-shared-reporting-impl -BuildRequires: maven-shared-test-tools +BuildRequires: maven-test-tools Requires: maven2 Requires: jpackage-utils Requires: java @@ -72,11 +73,12 @@ Requires: maven-plugin-testing = %{version}-%{release} %description -n maven-test-tools Framework to test Maven Plugins with Easymock objects. -Obsoletes: maven-shared-test-tools <= 0:1.0 -Provides : maven-shared-test-tools = 1:%{version}-%{release} +Obsoletes: maven-shared-test-tools <= 0:%{version}-%{release} +Provides: maven-shared-test-tools = 1:%{version}-%{release} %prep %setup -q #You may need to update this according to your Source0 +rm -fr src/site/site.xml %build export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository @@ -84,6 +86,7 @@ mvn-jpp \ -e \ -Dmaven2.jpp.mode=true \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + -Dmaven2.jpp.depmap.file=%{SOURCE1} \ -Dmaven.test.skip=true \ install javadoc:javadoc #tests are skipped due to some test failures most probably caused by issues with our plexus container @@ -161,6 +164,9 @@ rm -rf %{buildroot} %{_javadir}/%{name}/maven-test-tools* %changelog +* Mon May 31 2010 Alexander Kurtakov 1.2-4 +- Add depmap to fix build + * Sat May 29 2010 Alexander Kurtakov 1.2-3 - Obsolete maven-shared-test-tools.