From 83e4b639f43c63f76d878f322115dedbc31b2000 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Tue, 23 Oct 2012 21:50:56 +0300
Subject: [PATCH] Update to latest upstream.

---
 .gitignore                              |  1 +
 maven-resources-plugin-plexus-dep.patch | 29 -------------------------
 maven-resources-plugin.spec             | 16 +++++---------
 sources                                 |  2 +-
 4 files changed, 8 insertions(+), 40 deletions(-)
 delete mode 100644 maven-resources-plugin-plexus-dep.patch

diff --git a/.gitignore b/.gitignore
index f4c0ded..5b1ecdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 maven-resources-plugin-2.2.tar.gz
 /maven-resources-plugin-2.4.3.tar.gz
 /maven-resources-plugin-2.5.tar.gz
+/maven-resources-plugin-2.6-source-release.zip
diff --git a/maven-resources-plugin-plexus-dep.patch b/maven-resources-plugin-plexus-dep.patch
deleted file mode 100644
index 78ab5ef..0000000
--- a/maven-resources-plugin-plexus-dep.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index f74aea0..5bb5ce2 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -65,6 +65,11 @@ under the License.
-     
-   <dependencies>
-     <dependency>
-+      <groupId>org.codehaus.plexus</groupId>
-+      <artifactId>plexus-container-default</artifactId>
-+      <version>1.0-alpha-9-stable-1</version>
-+    </dependency>
-+   <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-plugin-api</artifactId>
-       <version>${mavenVersion}</version>
-@@ -102,12 +107,6 @@ under the License.
- 
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
--      <artifactId>plexus-container-default</artifactId>
--      <version>1.0-alpha-9-stable-1</version>
--    </dependency>
--
--    <dependency>
--      <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-utils</artifactId>
-       <version>2.0.5</version>
-     </dependency>
diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec
index fbbce2a..db355ff 100644
--- a/maven-resources-plugin.spec
+++ b/maven-resources-plugin.spec
@@ -1,18 +1,12 @@
 Name:           maven-resources-plugin
-Version:        2.5
-Release:        6%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        Maven Resources Plugin
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-resources-plugin
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin-2.5 maven-resources-plugin-2.5
-#tar zcf maven-resources-plugin-2.5.tar.gz maven-resources-plugin-2.5/
-Source0:        %{name}-%{version}.tar.gz
-
-# Relocation of plexus-container-default is necessary as sisu gets to the
-# classpath first and uses an old version of a class from container-default
-Patch0:         %{name}-plexus-dep.patch
+Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 BuildArch: noarch
 
@@ -65,7 +59,6 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
 
 %build
 mvn-rpmbuild \
@@ -97,6 +90,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Oct 23 2012 Alexander Kurtakov <akurtako@redhat.com> 2.6-1
+- Update to latest upstream.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 5417ea9..fc16c15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1ed763c6c5e4776a5a33a35f7875cd1  maven-resources-plugin-2.5.tar.gz
+67de5bb27f1b9aa58f298ed2557aead5  maven-resources-plugin-2.6-source-release.zip