OBS-URL: https://build.opensuse.org/package/show/Java:packages/javamail?expand=0&rev=12

javamail.spec

@@ -23,18 +23,20 @@ Release:        0
 Summary:        Java Mail API
 License:        CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 Group:          Development/Libraries/Java
-URL:            http://www.oracle.com/technetwork/java/javamail
+URL:            https://www.oracle.com/technetwork/java/javamail
 Source:         https://github.com/javaee/javamail/archive/%{git_tag}.tar.gz
 Patch0:         %{name}-javadoc.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  jaf
 BuildRequires:  javapackages-local
 BuildRequires:  perl-XML-XPath
 # Adapted from the classpathx-mail (and JPackage glassfish-javamail) Provides.
 Provides:       javamail-monolithic = %{version}-%{release}
 Provides:       javax.mail
 BuildArch:      noarch
+%if 0%{?suse_version} > 1500
+BuildRequires:  jaf
+%endif
 
 %description
 The JavaMail API provides a platform-independent and protocol-independent
@@ -70,7 +72,9 @@ add_dep javax.mail mailapijar
 # based on ${project.version}. We don't have osgiversion plugin so we
 # will set ${mail.osgiversion} explicitly.
 %pom_remove_plugin org.glassfish.hk2:osgiversion-maven-plugin
-
+%if 0%{?suse_version} <= 1500
+%pom_remove_dep javax.activation:activation
+%endif
 %pom_xpath_inject /pom:project/pom:properties "<mail.osgiversion>%{version}</mail.osgiversion>"
 %pom_xpath_inject /pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:instructions "<_nouses>true</_nouses>"
 
@@ -81,7 +85,11 @@ rm mail/src/test/java/com/sun/mail/smtp/SMTPWriteTimeoutTest.java
 %pom_remove_parent .
 
 %build
-%{ant} -Djavac.source=1.6 -Djavac.target=1.6 -Dactivation.jar=$(find-jar jaf/javax.activation) jar jars docs
+%{ant} -Djavac.source=1.6 -Djavac.target=1.6 \
+%if 0%{?suse_version} > 1500
+    -Dactivation.jar=$(find-jar jaf/javax.activation) \
+%endif
+    jar jars docs
 
 %install
 get_name() {