[geronimo-annotation] Build with maven 3.

[Alexander Kurtakov]

commit b212f2a61b43409583d458f4dfe7b16126e1e7ad
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Dec 16 10:57:10 2011 +0200

    Build with maven 3.

 geronimo-annotation.spec |   44 +++++++++++---------------------------------
 1 files changed, 11 insertions(+), 33 deletions(-)
---
diff --git a/geronimo-annotation.spec b/geronimo-annotation.spec
index 2e74bd3..17b42bf 100644
--- a/geronimo-annotation.spec
+++ b/geronimo-annotation.spec
@@ -3,7 +3,7 @@
 
 Name:             geronimo-annotation
 Version:          1.0
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Java EE: Annotation API v1.1
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -11,19 +11,16 @@ URL:              http://geronimo.apache.org/
 
 Source0:          http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{spec_name}/%{version}/%{spec_name}-%{version}-source-release.tar.gz
 Patch1:           use_parent_pom.patch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
-BuildRequires:    maven2 >= 2.2.1
+BuildRequires:    maven
 BuildRequires:    geronimo-parent-poms
 BuildRequires:    maven-resources-plugin
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 Provides:         annotation_api = %{spec_ver}
 
@@ -45,56 +42,37 @@ sed -i 's/\r//' LICENSE
 %patch1 -p0
 
 %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}/annotation.jar
+install -m 644 target/%{spec_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -s %{name}.jar %{buildroot}%{_javadir}/annotation.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-annotation_1.0_spec 1.1.1 JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.geronimo.specs:geronimo-annotation_1.0_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
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Dec 16 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0-5
+- Build with maven 3.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild