[geronimo-interceptor] Build with maven 3.

[Alexander Kurtakov]

commit ab51556ffc0a0d5c5254b48a5e7de1e6d770ab7e
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Dec 16 11:39:05 2011 +0200

    Build with maven 3.

 geronimo-interceptor.spec |   43 ++++++++++---------------------------------
 1 files changed, 10 insertions(+), 33 deletions(-)
---
diff --git a/geronimo-interceptor.spec b/geronimo-interceptor.spec
index fc149a8..49128bb 100644
--- a/geronimo-interceptor.spec
+++ b/geronimo-interceptor.spec
@@ -3,7 +3,7 @@
 
 Name:             geronimo-interceptor
 Version:          1.0.1
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Java EE: Interceptor API v3.0
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -12,7 +12,6 @@ URL:              http://geronimo.apache.org/
 # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-interceptor_3.0_spec-1.0.1/
 # tar czf geronimo-interceptor_3.0_spec-1.0.1.tar.gz geronimo-interceptor_3.0_spec-1.0.1/
 Source0:          %{spec_name}-%{version}.tar.gz
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
@@ -23,8 +22,6 @@ BuildRequires:    maven-resources-plugin
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 Provides:         interceptor_api = %{spec_ver}
 
@@ -45,57 +42,37 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{spec_name}-%{version}
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/interceptor.jar
+install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -s %{name}.jar %{buildroot}%{_javadir}/interceptor.jar
 
 # poms
 install -d -m 0755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.geronimo.specs %{spec_name} %{version} JPP %{name}
-%add_to_maven_depmap org.apache.geronimo.specs geronimo-interceptor_1.1_spec 1.0 JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.geronimo.specs:geronimo-interceptor_1.1_spec"
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%clean
-rm -rf %{buildroot}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Dec 16 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-5
+- Build with maven 3.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild