From 330814a6d20a202f9426cac0f4843d0f55500f413bac11a2fbad491952cd1a2c Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 30 Mar 2022 10:19:39 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/javamail?expand=0&rev=18

---
 javamail.changes |  5 +++++
 javamail.spec    | 12 ++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/javamail.changes b/javamail.changes
index b494d5e..abe7094 100644
--- a/javamail.changes
+++ b/javamail.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 30 10:19:25 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build against the standalone JavaEE modules inconditionally
+
 -------------------------------------------------------------------
 Fri Mar 18 19:20:43 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/javamail.spec b/javamail.spec
index c410d16..dc87479 100644
--- a/javamail.spec
+++ b/javamail.spec
@@ -28,17 +28,15 @@ Source:         https://github.com/javaee/javamail/archive/%{git_tag}.tar.gz
 Patch0:         %{name}-javadoc.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
+BuildRequires:  glassfish-activation-api
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  perl-XML-XPath
+Requires:       mvn(javax.activation:activation)
 # 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:  glassfish-activation-api
-Requires:       mvn(javax.activation:activation)
-%endif
 
 %description
 The JavaMail API provides a platform-independent and protocol-independent
@@ -55,10 +53,6 @@ Group:          Documentation/HTML
 %setup -q -n %{name}-%{git_tag}
 %patch0 -p1
 
-%if 0%{?suse_version} <= 1500
-%pom_remove_dep javax.activation:activation pom.xml
-%endif
-
 add_dep() {
     %pom_xpath_inject pom:project "<dependencies/>" ${2}
     %pom_add_dep com.sun.mail:${1}:%{version}:provided ${2}
@@ -89,9 +83,7 @@ rm mail/src/test/java/com/sun/mail/smtp/SMTPWriteTimeoutTest.java
 
 %build
 %{ant} -Djavac.source=1.8 -Djavac.target=1.8 \
-%if 0%{?suse_version} > 1500
     -Dactivation.jar=$(find-jar glassfish-activation-api) \
-%endif
     jar jars docs
 
 %install