[javamail] Build with maven3.

[Alexander Kurtakov]

commit b110703479ba02711733ec4add03902003aa9425
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Tue Nov 29 14:49:21 2011 +0200

    Build with maven3.
    
    - Adapt to current guidelines.

 javamail.spec |   44 ++++++++++++--------------------------------
 1 files changed, 12 insertions(+), 32 deletions(-)
---
diff --git a/javamail.spec b/javamail.spec
index bcb1cb6..b31e963 100644
--- a/javamail.spec
+++ b/javamail.spec
@@ -1,6 +1,6 @@
 Name:		javamail
 Version:	1.4.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Java Mail API
 
 Group:		Development/Libraries
@@ -22,7 +22,6 @@ Source6:	http://download.java.net/maven/2/com/sun/mail/imap/%{version}/imap-%{ve
 Source7:	http://download.java.net/maven/2/com/sun/mail/pop3/%{version}/pop3-%{version}.pom
 Source8:	http://download.java.net/maven/2/com/sun/mail/smtp/%{version}/smtp-%{version}.pom
 
-# Parent POM for many of the above
 # http://kenai.com/projects/javamail/sources/mercurial/content/parent-distrib/pom.xml?raw=true
 Source9:	%{name}-parent-distrib.pom
 
@@ -31,7 +30,7 @@ Source9:	%{name}-parent-distrib.pom
 Patch0:		%{name}-cleanup-poms.patch
 
 BuildRequires:	jpackage-utils
-BuildRequires:	maven2
+BuildRequires:	maven
 BuildRequires:	maven-assembly-plugin
 BuildRequires:	maven-compiler-plugin
 BuildRequires:	maven-dependency-plugin
@@ -43,14 +42,11 @@ BuildRequires:	maven-site-plugin
 BuildRequires:	maven-plugin-bundle
 BuildRequires:	maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit4
-BuildRequires:	tomcat6
 BuildRequires:	tomcat6-jsp-2.1-api
 
 BuildRequires:	java-devel >= 1:1.6.0
 
 Requires:	jpackage-utils
-Requires(post):	jpackage-utils
-Requires(postun): jpackage-utils
 
 # Requirements from POMs
 Requires:	tomcat6-jsp-2.1-api
@@ -105,12 +101,9 @@ done
 
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
+mvn-rpmbuild \
+    -Dproject.build.sourceEncoding=UTF-8 \
 	-P deploy \
-	-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
 	package javadoc:aggregate
 
 
@@ -120,7 +113,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -d -m 755 p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-all.pom
-%add_to_maven_depmap com.sun.mail all %{version} JPP/%{name} all
+%add_maven_depmap JPP.%{name}-all.pom
 
 # Install everything
 for sub in mail dsn; do
@@ -139,42 +132,29 @@ for sub in mailapi imap pop3 smtp; do
 done
 
 # Add maven dependency information
-%add_to_maven_depmap javax.mail mail %{version} JPP/%{name} mail
-%add_to_maven_depmap com.sun.mail dsn %{version} JPP/%{name} dsn
-%add_to_maven_depmap javax.mail mailapi %{version} JPP/%{name} mail
-%add_to_maven_depmap com.sun.mail imap %{version} JPP/%{name} mail
-%add_to_maven_depmap com.sun.mail pop3 %{version} JPP/%{name} mail
-%add_to_maven_depmap com.sun.mail smtp %{version} JPP/%{name} mail
+%add_maven_depmap JPP.%{name}-mail.pom %{name}/mail.jar -a "javax.mail:mailapi,com.sun.mail:imap,com.sun.mail:pop3,com.sun.mail:smtp"
+%add_maven_depmap JPP.%{name}-dsn.pom %{name}/dsn.jar
 
 install -m 644 poms/%{name}-parent-distrib.pom \
 	$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-parent-distrib.pom
-%add_to_maven_depmap com.sun.mail parent-distrib %{version} JPP/%{name} parent-distrib
-
-
-%post
-%update_maven_depmap
+%add_maven_depmap JPP.%{name}-parent-distrib.pom
 
-%postun
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
-%defattr(-,root,root,-)
 %doc mail/src/main/resources/META-INF/LICENSE.txt mail/overview.html
 %{_javadir}/%{name}
 %config(noreplace) %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*.pom
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Nov 29 2011 Alexander Kurtakov <akurtako at redhat.com> 1.4.3-7
+- Build with maven3.
+- Adapt to current guidelines.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild