.gitignore

@@ -1 +1 @@
-SOURCES/mail-1.6.5.tar.gz
+SOURCES/mail-2.1.2.tar.gz

.jakarta-mail.metadata

@@ -1 +1 @@
-87b7b390e39d6afa9d4111c2301ed0236b789ba5 SOURCES/mail-1.6.5.tar.gz
+56366dde00036a77ceef98ccd22ea153ca3393ea SOURCES/mail-2.1.2.tar.gz

SPECS/jakarta-mail.spec

@@ -1,98 +1,131 @@
+%bcond_with bootstrap
+
 Name:           jakarta-mail
-Version:        1.6.5
+Version:        2.1.2
-Release:        6%{?dist}
+Release:        5%{?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
 
 Source0:        https://github.com/eclipse-ee4j/mail/archive/%{version}/mail-%{version}.tar.gz
 
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
-BuildRequires:  mvn(com.sun.activation:jakarta.activation)
+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
-# package renamed in fedora 34, remove in fedora 36+
-Provides:       javamail = %{version}-%{release}
-Obsoletes:      javamail < 1.5.2-16
-
-# 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}.
+
 %prep
-%setup -n mail-%{version}
+%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 :buildnumber-maven-plugin
-%pom_remove_plugin :maven-enforcer-plugin
+
-%pom_remove_plugin :osgiversion-maven-plugin
+# Missing dependency
-
+%pom_remove_dep :angus-activation
-# disable android-specific code
+rm src/test/java/jakarta/mail/internet/NonAsciiFileNamesTest.java
-%pom_disable_module android
+popd
-
-# 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
-sed -i "s/\${mail\.osgiversion}/%{version}/g" mail/pom.xml
-sed -i "s/\${mail\.osgiversion}/%{version}/g" mailapi/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
 
 %build
-# skip javadoc build due to https://github.com/fedora-java/xmvn/issues/58
+pushd api
-%mvn_build -j
+%mvn_build
+popd
 
 %install
+pushd api
 %mvn_install
+popd
 
-%files -f .mfiles
+%files -f api/.mfiles
 %license LICENSE.md NOTICE.md
 %doc README.md
 
+%files javadoc -f api/.mfiles-javadoc
+%license LICENSE.md NOTICE.md
+
 %changelog
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1.6.5-6
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.1.2-5
-- Rebuild with regenerated Requires on Java
+- Rebuilt for MSVSphere 10
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.5-5
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.1.2-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Bump release for Aug 2024 java mass rebuild
-  Related: rhbz#1991688
 
-* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.5-4
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.1.2-4
-- Add build-dependency on junit
+- Bump release for June 2024 mass rebuild
-- Resolves: rhbz#1976998
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Andrew Bauer <zonexpertconsulting@outlook.com> - 2.1.2-1
+- Update to 2.1.2 release
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.0-2
+- Rebuild
+
+* Mon Aug 21 2023 Marian Koncek <mkoncek@redhat.com> - 2.1.0-1
+- Update to upstream version 2.1.0
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.5-3
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.7-5
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.6.7-2
+- Rebuilt for Drop i686 JDKs
+
+* 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
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.6.5-8
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jan 05 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.5-6
+- Disable tests failing due to glibc rhbz#2033020
+- Remove obsoletes/provides on javamail
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.5-5
+- Fix build with OpenJDK 17
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.5-3
+- Add build-dependency on junit
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
 * Sat Sep 19 2020 Fabio Valentini <decathorpe@gmail.com> - 1.6.5-1
 - Initial package renamed from javamail.
-