From e5c63d20b926d97af8bdabf6084f453aacd3be68 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotni@fedoraproject.org>
Date: Jul 16 2010 08:21:54 +0000
Subject: Fix bug #613582


---

diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index 494fa97..7fc7296 100644
--- a/maven-remote-resources-plugin.spec
+++ b/maven-remote-resources-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-remote-resources-plugin
 Version:        1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Maven Remote Resources Plugin
 
 Group:          Development/Libraries
@@ -74,8 +74,13 @@ API documentation for %{name}.
 %prep
 %setup -q 
 %patch0 -p0
+%patch1 -p1
 
 %build
+# fix 613582
+# we now use plexus-velocity which has the correct descriptor with a hint.
+rm -f src/main/resources/META-INF/plexus/components.xml
+
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mvn-jpp \
         -e \
@@ -125,6 +130,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Jul 15 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1-6
+- Fix bug #613582
+
 * Tue Jul 13 2010 Hui Wang <huwang@redhat.com> - 1.1-5
 - Add missing requires maven2