From 96f5bce8e1b583c0255caf58d623606bc9812491 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 19 Apr 2016 08:10:51 +0200
Subject: [PATCH] Update to upstream version 3.1.1

---
 .gitignore           |  1 +
 plexus-archiver.spec | 40 ++++++++++++++++++----------------------
 sources              |  2 +-
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index d3625e6..b8de1bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz
 /plexus-archiver-2.8.2.tar.gz
 /plexus-archiver-3.0.tar.gz
 /plexus-archiver-dc873a4.tar.gz
+/plexus-archiver-3.1.1.tar.gz
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index aa575c7..9ce2335 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -1,28 +1,24 @@
-%global commit dc873a4d3eb1ae1e55d661dff8ed85ec3d8eb936
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 Name:           plexus-archiver
-Version:        3.0.1
-Release:        0.3.git%{shortcommit}%{?dist}
+Version:        3.1.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Plexus Archiver Component
 License:        ASL 2.0
 URL:            https://github.com/codehaus-plexus/plexus-archiver
 BuildArch:      noarch
 
-Source0:        https://github.com/codehaus-plexus/plexus-archiver/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
-
-# This prevents "Too many open files" when building Eclipse documentation
-# bundles inside a slow VM/mock environment
-# This problem is reported upstream: https://github.com/codehaus-plexus/plexus-archiver/issues/6
-Patch0:         0001-Avoid-using-ParallelScatterZipCreator.patch
+Source0:        https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz
 
 BuildRequires:  maven-local
-BuildRequires:  plexus-containers-container-default
-BuildRequires:  plexus-io
-BuildRequires:  plexus-utils
-BuildRequires:  apache-commons-compress
-BuildRequires:  snappy-java
+BuildRequires:  mvn(com.google.code.findbugs:jsr305)
+BuildRequires:  mvn(org.apache.commons:commons-compress)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-io) >= 2.7
+BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.iq80.snappy:snappy)
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -41,12 +37,9 @@ Javadoc for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{commit}
-%pom_remove_plugin :maven-shade-plugin
+%setup -q -n %{name}-%{name}-%{version}
 %mvn_file :%{name} plexus/archiver
 
-%patch0 -p1
-
 %build
 %mvn_build -f
 
@@ -54,12 +47,15 @@ Javadoc for %{name}.
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE
+%license LICENSE
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE
+%license LICENSE
 
 %changelog
+* Tue Apr 19 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-1
+- Update to upstream version 3.1.1
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:3.0.1-0.3.gitdc873a4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 3fbdc27..9ad5bad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65210fe1db958dafe1edda084e29b011  plexus-archiver-dc873a4.tar.gz
+d9373ed90fc901ec3c0dc626371caaad  plexus-archiver-3.1.1.tar.gz