[plexus-archiver] Update to 1.1.

[Alexander Kurtakov]

commit e339563eea37a6ad9f94b42dd4501992500136c6
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Oct 6 15:13:28 2010 +0300

    Update to 1.1.

 .gitignore                      |    1 +
 plexus-archiver-1.0-build.xml   |  127 ---------------------------------------
 plexus-archiver-1.0-project.xml |   67 --------------------
 plexus-archiver.spec            |   41 ++++++-------
 sources                         |    2 +-
 5 files changed, 21 insertions(+), 217 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf3bbd1..68bd693 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 plexus-archiver-src.tar.gz
 plexus-archiver-1.0-alpha-12-src.tar.bz2
+plexus-archiver-1.1-src.tar.xz
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index 6d9ee91..f7aff92 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -28,21 +28,15 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define namedversion 1.0-alpha-12
-
 Name:           plexus-archiver
-Version:        1.0
-Release:        0.4.a12.4%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Plexus Archiver Component
 License:        MIT and ASL 2.0
-Group:          Development/Java
+Group:          Development/Libraries
 URL:            http://plexus.codehaus.org/plexus-components/plexus-archiver/
-Source0:        plexus-archiver-%{namedversion}-src.tar.bz2
-# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-archiver-1.0-alpha-12/
-# tar cjvf plexus-archiver-1.0-alpha-12-src.tar.bz2 plexus-archiver-1.0-alpha-12/
-Source1:        plexus-archiver-1.0-build.xml
-Source2:        plexus-archiver-1.0-project.xml
+Source0:        plexus-archiver-%{version}-src.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -54,12 +48,12 @@ BuildRequires:  plexus-container-default
 BuildRequires:  plexus-utils 
 BuildRequires:  plexus-io
 BuildRequires: maven2
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit
 BuildRequires: maven-shared-reporting-impl
 BuildRequires: maven-doxia-sitetools
@@ -88,10 +82,10 @@ Javadoc for %{name}.
 
 
 %prep
-%setup -q -n plexus-archiver-%{namedversion}
+%setup -q 
 
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
+#remove not compilint tests
+rm -fr src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java
 
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -107,7 +101,7 @@ mvn-jpp \
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 target/%{name}-%{namedversion}.jar \
+install -pm 644 target/%{name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/plexus/archiver-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
                   do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
@@ -135,8 +129,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -144,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Oct 6 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-1
+- Update to 1.1.
+
 * Mon Dec 28 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.0-0.4.a12.4
 - Install depmap and pom to override common poms.
 
diff --git a/sources b/sources
index 7ed698d..c4eb668 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f756befd4d0d9fa12a4f10e510de563  plexus-archiver-1.0-alpha-12-src.tar.bz2
+475d5e7bff4a58bff88c74eb2ab2003a  plexus-archiver-1.1-src.tar.xz