diff --git a/jakarta-mail.spec b/jakarta-mail.spec
index 7f8d03e38257e18fec75e2e62b9dd34c75972748..9f41779f46da0e958980fc98bf916ebb568f1dbe 100644
--- a/jakarta-mail.spec
+++ b/jakarta-mail.spec
@@ -1,12 +1,12 @@
-%define anolis_release 2
+%define anolis_release 1
 
 %bcond_without bootstrap
 
 Name:           jakarta-mail
-Version:        1.6.7
+Version:        2.1.2
 Release:        %{anolis_release}%{?dist}
 Summary:        Jakarta Mail API
-License:        EPL-2.0 or GPLv2 with exceptions
+License:        EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 URL:            https://github.com/eclipse-ee4j/mail
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
@@ -17,21 +17,22 @@ Source0:        https://github.com/eclipse-ee4j/mail/archive/%{version}/mail-%{v
 BuildRequires:  javapackages-bootstrap
 %else
 BuildRequires:  maven-local
+BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 %endif
-BuildRequires:  mvn(com.sun.activation:jakarta.activation)
-
-# javadoc package is currently not built
-Obsoletes:      javamail-javadoc  < 1.5.2-16
 
 %description
 The Jakarta Mail API provides a platform-independent and
 protocol-independent framework to build mail and messaging applications.
 
+%package javadoc
+Summary:        Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}.
+
 %package doc
 Summary:        Documentation files for %{name}
 Requires:       %{name} = %{version}-%{release}
@@ -43,58 +44,41 @@ The %{name}-doc package contains documentation files for %{name}.
 %prep
 %setup -q -n mail-api-%{version}
 
-# remove unnecessary dependency on parent POM
+pushd api
+# Remove unnecessary dependency on parent POM
 %pom_remove_parent
 
-# 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
-
-# remove profiles that only add unnecessary things
-%pom_xpath_remove "pom:project/pom:profiles"
-
-# inject OSGi bundle versions manually instead of using osgiversion-maven-plugin
-find -name pom.xml -exec sed -i "s/\${mail\.osgiversion}/%{version}/g" {} +
+%pom_remove_plugin :buildnumber-maven-plugin
 
-# -Werror is considered harmful
-sed -i "/-Werror/d" mail/pom.xml
-
-# add aliases for old maven artifact coordinates
-%mvn_alias com.sun.mail:mailapi \
-    javax.mail:mailapi
-%mvn_alias com.sun.mail:jakarta.mail \
-    com.sun.mail:javax.mail \
-    javax.mail:mail \
-    org.eclipse.jetty.orbit:javax.mail.glassfish
-%mvn_alias jakarta.mail:jakarta.mail-api \
-    javax.mail:javax.mail-api
-
-# add symlinks for compatibilty with old classpaths
-%mvn_file com.sun.mail:jakarta.mail \
-    %{name}/jakarta.mail \
-    javamail/mail \
-    javamail/javax.mail \
-    javax.mail/javax.mail
+# Missing dependency
+%pom_remove_dep :angus-activation
+rm src/test/java/jakarta/mail/internet/NonAsciiFileNamesTest.java
+popd
 
 %build
-# skip javadoc build due to https://github.com/fedora-java/xmvn/issues/58
-# define the variable ${main.basedir} to avoid using directory-maven-plugin
-%mvn_build -j -f -- -Dmain.basedir=${PWD}
+pushd api
+%mvn_build
+popd
 
 %install
+pushd api
 %mvn_install
+popd
 
-%files -f .mfiles
+%files -f api/.mfiles
 %license LICENSE.md NOTICE.md
 
 %files doc
 %doc README.md
 
+%files javadoc -f api/.mfiles-javadoc
+%license LICENSE.md NOTICE.md
+
 %changelog
+* Thu Feb 20 2025 Xiaoping Liu <lxp01404969@alibaba-inc.com> - 2.1.2-1
+- update to 2.1.2 from 1.6.7
+- Migrated to SPDX license
+
 * Wed Dec 27 2023 mgb01105731 <mgb01105731@alibaba-inc.com> - 1.6.7-2
 - rebuild
 
diff --git a/mail-1.6.7.tar.gz b/mail-1.6.7.tar.gz
deleted file mode 100644
index f2aa6c4982914a8f0abe200645892b6bc00aa98d..0000000000000000000000000000000000000000
Binary files a/mail-1.6.7.tar.gz and /dev/null differ
diff --git a/mail-2.1.2.tar.gz b/mail-2.1.2.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..f7ac96f93a2a32594a084029c8cdc3a3b555fea9
Binary files /dev/null and b/mail-2.1.2.tar.gz differ