From eede14af4e81dfe9a789063f13ddbce020c6a41f Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 29 Apr 2022 14:14:49 +0200
Subject: [PATCH] Update to upstream version 1.6.7

---
 .gitignore        |  1 +
 jakarta-mail.spec | 15 ++++++++++-----
 sources           |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 95bc5af..ce8fed8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /*.src.rpm
 
 /mail-1.6.5.tar.gz
+/mail-1.6.7.tar.gz
diff --git a/jakarta-mail.spec b/jakarta-mail.spec
index 0f2d352..b58d2cf 100644
--- a/jakarta-mail.spec
+++ b/jakarta-mail.spec
@@ -1,6 +1,6 @@
 Name:           jakarta-mail
-Version:        1.6.5
-Release:        9%{?dist}
+Version:        1.6.7
+Release:        1%{?dist}
 Summary:        Jakarta Mail API
 License:        EPL-2.0 or GPLv2 with exceptions
 URL:            https://github.com/eclipse-ee4j/mail
@@ -32,6 +32,7 @@ protocol-independent framework to build mail and messaging applications.
 # disable unnecessary maven plugins
 %pom_remove_plugin :maven-enforcer-plugin
 %pom_remove_plugin :osgiversion-maven-plugin
+%pom_remove_plugin :directory-maven-plugin
 
 # disable android-specific code
 %pom_disable_module android
@@ -40,8 +41,7 @@ protocol-independent framework to build mail and messaging applications.
 %pom_xpath_remove "pom:project/pom:profiles"
 
 # inject OSGi bundle versions manually instead of using osgiversion-maven-plugin
-sed -i "s/\${mail\.osgiversion}/%{version}/g" mail/pom.xml
-sed -i "s/\${mail\.osgiversion}/%{version}/g" mailapi/pom.xml
+find -name pom.xml -exec sed -i "s/\${mail\.osgiversion}/%{version}/g" {} +
 
 # -Werror is considered harmful
 sed -i "/-Werror/d" mail/pom.xml
@@ -74,7 +74,9 @@ sed -i "/-Werror/d" mail/pom.xml
 # Related bugs:
 # https://bugzilla.redhat.com/show_bug.cgi?id=2023741
 # https://bugzilla.redhat.com/show_bug.cgi?id=2033020
-%mvn_build -j -f
+#
+# define the variable ${main.basedir} to avoid using directory-maven-plugin
+%mvn_build -j -f -- -Dmain.basedir=${PWD}
 
 %install
 %mvn_install
@@ -84,6 +86,9 @@ sed -i "/-Werror/d" mail/pom.xml
 %doc README.md
 
 %changelog
+* Fri Apr 29 2022 Marian Koncek <mkoncek@redhat.com> - 1.6.7-1
+- Update to upstream version 1.6.7
+
 * Wed Apr 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.5-9
 - Workaround build issue with RPM 4.18
 
diff --git a/sources b/sources
index 8ada68f..b9cd39e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mail-1.6.5.tar.gz) = 6ddf2b17a2948edf78cd343d7261145d402c285c6430d157fb88013ed59a6012a0b6913f194b7532ccd59d64c3272fef8e6d88cb68316d8b8d7b210ca17e3b0f
+SHA512 (mail-1.6.7.tar.gz) = 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08