[javamail] - Drop gcj_support. - Use javadoc:aggregate.

[Alexander Kurtakov]

commit 2ba08468bd61b984d9bf95fa3302a829eb326e7a
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Sep 8 16:07:25 2010 +0300

    - Drop gcj_support.
    - Use javadoc:aggregate.

 javamail.spec |   60 ++++++++++++++++----------------------------------------
 1 files changed, 17 insertions(+), 43 deletions(-)
---
diff --git a/javamail.spec b/javamail.spec
index fdaa350..88de794 100644
--- a/javamail.spec
+++ b/javamail.spec
@@ -1,8 +1,6 @@
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
 Name:		javamail
 Version:	1.4.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Java Mail API
 
 Group:		Development/Libraries
@@ -36,16 +34,16 @@ BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	jpackage-utils
 BuildRequires:	maven2
-BuildRequires:	maven2-plugin-assembly
-BuildRequires:	maven2-plugin-compiler 
-BuildRequires:	maven2-plugin-dependency
-BuildRequires:	maven2-plugin-install
-BuildRequires:	maven2-plugin-jar
-BuildRequires:	maven2-plugin-javadoc
-BuildRequires:	maven2-plugin-resources
-BuildRequires:	maven2-plugin-site
+BuildRequires:	maven-assembly-plugin
+BuildRequires:	maven-compiler-plugin
+BuildRequires:	maven-dependency-plugin
+BuildRequires:	maven-install-plugin
+BuildRequires:	maven-jar-plugin
+BuildRequires:	maven-javadoc-plugin
+BuildRequires:	maven-resources-plugin
+BuildRequires:	maven-site-plugin
 BuildRequires:	maven-plugin-bundle
-BuildRequires:	maven-surefire-maven-plugin
+BuildRequires:	maven-surefire-plugin
 BuildRequires:	tomcat5
 BuildRequires:	tomcat5-jsp-2.0-api
 
@@ -61,14 +59,7 @@ Requires:	tomcat5-jsp-2.0-api
 # Adapted from the classpathx-mail (and JPackage glassfish-javamail) Provides
 Provides:	javamail-monolithic = 0:%{version}
 
-%if %{with_gcj}
-BuildRequires:	java-gcj-compat-devel >= 1.0.31
-Requires(post):	java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%else
 BuildArch:	noarch
-%endif
-
 
 %description
 The JavaMail API provides a platform-independent and protocol-independent
@@ -122,7 +113,7 @@ mkdir -p $MAVEN_REPO_LOCAL
 mvn-jpp \
 	-P deploy \
 	-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-	package javadoc:javadoc
+	package javadoc:aggregate
 
 
 %install
@@ -140,9 +131,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-all.
 for sub in mail dsn; do
 	install -m 644 $sub/target/$sub.jar \
 		$RPM_BUILD_ROOT%{_javadir}/%{name}/$sub-%{version}.jar
-	install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$sub/
-	cp -pr $sub/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$sub/
 done
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
 install -m 644 mail/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
 install -m 644 dsn/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-dsn.pom
 
@@ -166,32 +157,14 @@ install -m 644 poms/%{name}-parent-distrib.pom \
 
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_maven_depmap
-%if %{with_gcj}
-  if [ -x %{_bindir}/rebuild-gcj-db ] 
-  then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{with_gcj}
-  if [ -x %{_bindir}/rebuild-gcj-db ] 
-  then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
-
 
 %files
 %defattr(-,root,root,-)
@@ -199,9 +172,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/%{name}
 %config(noreplace) %{_mavendepmapfragdir}/*
 %{_datadir}/maven2/poms/*.pom
-%if %{with_gcj}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -210,6 +180,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 8 2010 Alexander Kurtakov <akurtako at redhat.com> 1.4.3-3
+- Drop gcj_support.
+- Use javadoc:aggregate.
+
 * Fri Jan  8 2010 Mary Ellen Foster <mefoster at gmail.com> 1.4.3-2
 - Remove unnecessary (build)requirement tomcat5-servlet-2.4-api
 - Move jar files into subdirectory