[maven-archiver] Build with xmvn

[Mikolaj Izdebski]

commit 6873763ad090d8efd7e2d4afc5e4c796a1cd80fd
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Feb 19 07:57:59 2013 +0100

    Build with xmvn

 maven-archiver-maven-core-dep.patch |   22 --------
 maven-archiver.spec                 |   95 ++++++----------------------------
 2 files changed, 17 insertions(+), 100 deletions(-)
---
diff --git a/maven-archiver.spec b/maven-archiver.spec
index bf86e27..46ae60c 100644
--- a/maven-archiver.spec
+++ b/maven-archiver.spec
@@ -1,59 +1,18 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
 Name:           maven-archiver
 Version:        2.5
-Release:        5%{?dist}
+Release:        7%{?dist}
 Epoch:          0
 Summary:        Maven Archiver
 License:        ASL 2.0
-Group:          Development/Libraries
 URL:            http://maven.apache.org/shared/maven-archiver/
-
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
-
-Patch0:         %{name}-maven-core-dep.patch
-
 BuildArch:      noarch
 
-BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven-local
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-shared
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-site-plugin
-BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  maven-shared-jar
 BuildRequires:  plexus-interpolation
@@ -61,13 +20,8 @@ BuildRequires:  plexus-archiver >= 2.1-1
 BuildRequires:  plexus-utils
 BuildRequires:  apache-commons-parent
 
-Requires:       maven
-Requires:       plexus-archiver >= 2.1-1
-Requires:       plexus-interpolation
-Requires:       plexus-utils
-
-Provides: maven-shared-archiver = %{version}-%{release}
-Obsoletes: maven-shared-archiver < %{version}-%{release}
+Provides:       maven-shared-archiver = %{version}-%{release}
+Obsoletes:      maven-shared-archiver < %{version}-%{release}
 
 %description
 The Maven Archiver is used by other Maven plugins
@@ -75,50 +29,35 @@ to handle packaging
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-
-#tests don't compile with maven 2.2.1
+%pom_add_dep org.apache.maven:maven-core
+# tests don't compile with maven 2.2.1
 rm -fr src/test/java/org/apache/maven/archiver/*.java
 
 %build
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
-
+%mvn_build
 
 %install
-# jars/poms
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-
-# Copy file and create unversioned symlink
-install -pm 644 target/%{name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%mvn_install
 
-# Copy pom
-install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%files -f .mfiles
+%doc LICENSE NOTICE
 
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
 
-%files
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%changelog
+* Tue Feb 19 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:2.5-7
+- Build with xmvn
 
-%files javadoc
-%doc %{_javadocdir}/*
+* Tue Feb 19 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:2.5-6
+- Add missing license files
 
-%changelog
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild