Update to upstream version 1.6.7

This commit is contained in:
Marian Koncek 2022-04-29 14:14:49 +02:00
parent 6fc518e3cf
commit eede14af4e
3 changed files with 12 additions and 6 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/*.src.rpm /*.src.rpm
/mail-1.6.5.tar.gz /mail-1.6.5.tar.gz
/mail-1.6.7.tar.gz

View File

@ -1,6 +1,6 @@
Name: jakarta-mail Name: jakarta-mail
Version: 1.6.5 Version: 1.6.7
Release: 9%{?dist} Release: 1%{?dist}
Summary: Jakarta Mail API Summary: Jakarta Mail API
License: EPL-2.0 or GPLv2 with exceptions License: EPL-2.0 or GPLv2 with exceptions
URL: https://github.com/eclipse-ee4j/mail URL: https://github.com/eclipse-ee4j/mail
@ -32,6 +32,7 @@ protocol-independent framework to build mail and messaging applications.
# disable unnecessary maven plugins # disable unnecessary maven plugins
%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :osgiversion-maven-plugin %pom_remove_plugin :osgiversion-maven-plugin
%pom_remove_plugin :directory-maven-plugin
# disable android-specific code # disable android-specific code
%pom_disable_module android %pom_disable_module android
@ -40,8 +41,7 @@ protocol-independent framework to build mail and messaging applications.
%pom_xpath_remove "pom:project/pom:profiles" %pom_xpath_remove "pom:project/pom:profiles"
# inject OSGi bundle versions manually instead of using osgiversion-maven-plugin # inject OSGi bundle versions manually instead of using osgiversion-maven-plugin
sed -i "s/\${mail\.osgiversion}/%{version}/g" mail/pom.xml find -name pom.xml -exec sed -i "s/\${mail\.osgiversion}/%{version}/g" {} +
sed -i "s/\${mail\.osgiversion}/%{version}/g" mailapi/pom.xml
# -Werror is considered harmful # -Werror is considered harmful
sed -i "/-Werror/d" mail/pom.xml sed -i "/-Werror/d" mail/pom.xml
@ -74,7 +74,9 @@ sed -i "/-Werror/d" mail/pom.xml
# Related bugs: # Related bugs:
# https://bugzilla.redhat.com/show_bug.cgi?id=2023741 # https://bugzilla.redhat.com/show_bug.cgi?id=2023741
# https://bugzilla.redhat.com/show_bug.cgi?id=2033020 # 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 %install
%mvn_install %mvn_install
@ -84,6 +86,9 @@ sed -i "/-Werror/d" mail/pom.xml
%doc README.md %doc README.md
%changelog %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 * Wed Apr 27 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.5-9
- Workaround build issue with RPM 4.18 - Workaround build issue with RPM 4.18

View File

@ -1 +1 @@
SHA512 (mail-1.6.5.tar.gz) = 6ddf2b17a2948edf78cd343d7261145d402c285c6430d157fb88013ed59a6012a0b6913f194b7532ccd59d64c3272fef8e6d88cb68316d8b8d7b210ca17e3b0f SHA512 (mail-1.6.7.tar.gz) = 9e8754839efb43d14ade6189428c4b86f5fc180e2e18b4e121a9463aaa52c34a431dbf05a6264ef8221faf0b09cc08f914ff758cbb3931df97cea1a897c54c08