rpms/maven-remote-resources-plugin/devel maven-remote-resources-plugin.spec, 1.4, 1.5

[Stanislav Ochotnicky]

Author: sochotni

Update of /cvs/pkgs/rpms/maven-remote-resources-plugin/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8109

Modified Files:
	maven-remote-resources-plugin.spec 
Log Message:
Fix bug #613582


Index: maven-remote-resources-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven-remote-resources-plugin/devel/maven-remote-resources-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- maven-remote-resources-plugin.spec	13 Jul 2010 09:33:45 -0000	1.4
+++ maven-remote-resources-plugin.spec	16 Jul 2010 08:21:54 -0000	1.5
@@ -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 at redhat.com> - 1.1-6
+- Fix bug #613582
+
 * Tue Jul 13 2010 Hui Wang <huwang at redhat.com> - 1.1-5
 - Add missing requires maven2