[maven-remote-resources-plugin] Fix velocity dependency in pom.xml

[Stanislav Ochotnicky]

commit 4b63c13c1d31ff48522426c8966c18a66877e39f
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Nov 3 18:40:48 2010 +0100

    Fix velocity dependency in pom.xml

 0001-Fix-velocity-dep.patch        |   27 +++++++++++++++++++++++++++
 maven-remote-resources-plugin.spec |   25 ++++++++++++++++---------
 2 files changed, 43 insertions(+), 9 deletions(-)
---
diff --git a/0001-Fix-velocity-dep.patch b/0001-Fix-velocity-dep.patch
new file mode 100644
index 0000000..8dbf5fe
--- /dev/null
+++ b/0001-Fix-velocity-dep.patch
@@ -0,0 +1,27 @@
+From f3665efdeec22a2f4549d37fe1ad5f3259f76b14 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Wed, 3 Nov 2010 18:32:20 +0100
+Subject: [PATCH] Fix velocity dep
+
+---
+ pom.xml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index eaad151..8206231 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -107,8 +107,8 @@ under the License.
+       <version>1.0-alpha-9</version>
+     </dependency>
+     <dependency>
+-      <groupId>velocity</groupId>
+-      <artifactId>velocity-dep</artifactId>
++      <groupId>org.apache.velocity</groupId>
++      <artifactId>velocity</artifactId>
+       <version>1.4</version>
+     </dependency>
+     <dependency>
+-- 
+1.7.3.2
+
diff --git a/maven-remote-resources-plugin.spec b/maven-remote-resources-plugin.spec
index 4343bdd..528b714 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:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Maven Remote Resources Plugin
 
 Group:          Development/Libraries
@@ -9,10 +9,13 @@ URL:            http://maven.apache.org/plugins/maven-remote-resources-plugin/
 #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-remote-resources-plugin-1.1/
 #tar jcf maven-remote-resources-plugin-1.1.tar.bz2 maven-remote-resources-plugin-1.1/
 Source0:        %{name}-%{version}.tar.bz2
-#Class org.apache.maven.shared.artifact.filter.collection.TransitivityFilter which ProcessRemoteResourcesMojo.java imports 
-#is renamed as org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter in 
+#Class org.apache.maven.shared.artifact.filter.collection.TransitivityFilter which ProcessRemoteResourcesMojo.java imports
+#is renamed as org.apache.maven.shared.artifact.filter.collection.ProjectTransitivityFilter in
 #the version 1.3 of maven-shared-common-artifact-filters package.
 Patch0:        ProcessRemoteResourcesMojo.java.patch
+
+# TODO: upstream
+Patch1:        0001-Fix-velocity-dep.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -55,11 +58,11 @@ Obsoletes:      maven2-plugin-remote-resources <= 0:2.0.8
 Provides:       maven2-plugin-remote-resources = 1:%{version}-%{release}
 
 %description
-Process resources packaged in JARs that have been deployed to 
-a remote repository. The primary use case being satisfied is 
-the consistent inclusion of common resources in a large set of 
-projects. Maven projects at Apache use this plug-in to satisfy 
-licensing requirements at Apache where each project much include 
+Process resources packaged in JARs that have been deployed to
+a remote repository. The primary use case being satisfied is
+the consistent inclusion of common resources in a large set of
+projects. Maven projects at Apache use this plug-in to satisfy
+licensing requirements at Apache where each project much include
 license and notice files for each release.
 
 %package javadoc
@@ -72,8 +75,9 @@ API documentation for %{name}.
 
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p0
+%patch1 -p1
 
 %build
 # fix 613582
@@ -129,6 +133,9 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov  3 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1-7
+- Fix velocity dependency in pom.xml
+
 * Thu Jul 15 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.1-6
 - Fix bug #613582