diff --git a/maven-resources-plugin-depmap.xml b/maven-resources-plugin-depmap.xml
new file mode 100644
index 0000000..f83bedd
--- /dev/null
+++ b/maven-resources-plugin-depmap.xml
@@ -0,0 +1,15 @@
+
+
+
+ org.apache.maven.shared
+ maven-plugin-testing-harness
+ 1.1
+
+
+ JPP/maven-plugin-testing
+ maven-plugin-testing-harness
+ 1.1
+
+
+
+
diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec
index 1721e39..9c8789e 100644
--- a/maven-resources-plugin.spec
+++ b/maven-resources-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-resources-plugin
Version: 2.2
-Release: 2%{?dist}
+Release: 5%{?dist}
Summary: Maven Resources Plugin
Group: Development/Libraries
@@ -9,6 +9,7 @@ URL: http://maven.apache.org/plugins/maven-resources-plugin
#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.2 maven-resources-plugin-2.2
#tar zcf maven-resources-plugin-2.2.tar.gz maven-resources-plugin-2.2/
Source0: %{name}-%{version}.tar.gz
+Source1: maven-resources-plugin-depmap.xml
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -16,22 +17,29 @@ BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven2
BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-javadoc-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-shared-plugin-testing-harness
+BuildRequires: maven-plugin-testing-harness
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: plexus-digest
+Requires: maven-plugin-testing-harness
Requires: maven2
Requires: jpackage-utils
Requires: java
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
+Provides: maven2-plugin-resources = %{version}-%{release}
+Obsoletes: maven2-plugin-resources <= 0:2.0.8
+
%description
The Resources Plugin handles the copying of project resources
to the output directory.
@@ -54,6 +62,8 @@ mvn-jpp \
-e \
-Dmaven2.jpp.mode=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+ -Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
@@ -100,7 +110,18 @@ rm -rf %{buildroot}
%{_javadocdir}/%{name}
%changelog
+* Tue May 20 2010 Hui Wang - 2.2-5
+- Add maven-resources-plugin-demap.xml
+- Set maven test ignore
+
+* Wed May 19 2010 Hui Wang - 2.2-4
+- Add missing obsoletes/provides
+
+* Wed May 19 2010 Hui Wang - 2.2-3
+- Add missing BR:maven-shared-reporting-impl
+
* Mon May 17 2010 Hui Wang - 2.2-2
- Fixed install -pm 644 pom.xml
+
* Thu May 13 2010 Hui Wang - 2.2-1
- Initial version of the package
\ No newline at end of file