Accepting request 1205260 from Java:packages

Spec file cleanup

OBS-URL: https://build.opensuse.org/request/show/1205260
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javamail?expand=0&rev=10
This commit is contained in:
Ana Guerrero 2024-10-03 16:00:23 +00:00 committed by Git OBS Bridge
commit f00805dedc
2 changed files with 10 additions and 7 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 2 15:48:59 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Spec file cleanup
-------------------------------------------------------------------
Sat Sep 7 09:09:45 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>

View File

@ -78,10 +78,8 @@ add_dep javax.mail mailapijar
rm mail/src/test/java/com/sun/mail/imap/IMAPIdleUntaggedResponseTest.java
rm mail/src/test/java/com/sun/mail/smtp/SMTPWriteTimeoutTest.java
%pom_remove_parent .
%build
%{ant} -Djavac.source=1.8 -Djavac.target=1.8 \
ant -Djavac.source=1.8 -Djavac.target=1.8 \
-Dactivation.jar=$(find-jar glassfish-activation-api) \
jar jars docs
@ -108,20 +106,20 @@ ln -sf ../%{name}/javax.mail.jar %{buildroot}%{_javadir}/javax.mail/
# poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
%mvn_install_pom pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name pom.xml).pom
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name pom.xml).pom
pompart=%{name}/$(get_name pom.xml).pom
%add_maven_depmap ${pompart}
for i in mailapijar smtp imap gimap pop3 dsn; do
%mvn_install_pom ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name ${i}/pom.xml).pom
%{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name ${i}/pom.xml).pom
pompart=%{name}/$(get_name ${i}/pom.xml).pom
jarpart=%{name}/$(get_name ${i}/pom.xml).jar
%add_maven_depmap ${pompart} ${jarpart}
done
%mvn_install_pom mail/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mail/pom.xml).pom
%{mvn_install_pom} mail/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mail/pom.xml).pom
pompart=%{name}/$(get_name mail/pom.xml).pom
jarpart=%{name}/$(get_name mail/pom.xml).jar
%add_maven_depmap ${pompart} ${jarpart} -a javax.mail:mail,org.eclipse.jetty.orbit:javax.mail.glassfish,com.sun.mail:jakarta.mail
%mvn_install_pom mailapi/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mailapi/pom.xml).pom
%{mvn_install_pom} mailapi/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/$(get_name mailapi/pom.xml).pom
pompart=%{name}/$(get_name mailapi/pom.xml).pom
jarpart=%{name}/$(get_name mailapi/pom.xml).jar
%add_maven_depmap ${pompart} ${jarpart} -a javax.mail:mailapi