From a212d2dade48d24cca25cfeb6c3fa465a3755fc61df5a449f2592c718c4689f9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 13 Jul 2022 14:12:59 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-activation?expand=0&rev=11 --- glassfish-activation.changes | 6 ++++++ glassfish-activation.spec | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/glassfish-activation.changes b/glassfish-activation.changes index d1a85c0..30e185e 100644 --- a/glassfish-activation.changes +++ b/glassfish-activation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 13 14:11:54 UTC 2022 - Fridrich Strba + +- Avoid missing symlink %_javadir/jaf.jar, by recreating it when + gnu-jaf is uninstalled + ------------------------------------------------------------------- Tue Jul 12 09:28:43 UTC 2022 - Fridrich Strba diff --git a/glassfish-activation.spec b/glassfish-activation.spec index cc0e03f..6be10e7 100644 --- a/glassfish-activation.spec +++ b/glassfish-activation.spec @@ -106,6 +106,15 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -r activation/target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir} +%triggerpostun -- gnu-jaf +if [ -f %{_javadir}/%{name}-api.jar ] then + if [ -f %{_javadir}/jaf.jar ] then + rm -f %{_javadir}/jaf.jar + fi + ln -sf %{name}-api.jar %{_javadir}/jaf.jar +fi +exit 0 + %files -f .mfiles %license LICENSE.txt %doc README.md From c80a15ba35418d7bddc68bb4e7f30dddcb9d8e682ecafd8fafc80412ae95a848 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 13 Jul 2022 14:14:47 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-activation?expand=0&rev=12 --- glassfish-activation.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glassfish-activation.spec b/glassfish-activation.spec index 6be10e7..75130e9 100644 --- a/glassfish-activation.spec +++ b/glassfish-activation.spec @@ -107,8 +107,8 @@ cp -r activation/target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir} %triggerpostun -- gnu-jaf -if [ -f %{_javadir}/%{name}-api.jar ] then - if [ -f %{_javadir}/jaf.jar ] then +if [ -f %{_javadir}/%{name}-api.jar ] ; then + if [ -f %{_javadir}/jaf.jar ] ; then rm -f %{_javadir}/jaf.jar fi ln -sf %{name}-api.jar %{_javadir}/jaf.jar From 6d122370e78b35dd59b309c48727d4648a260707cd51d8e05eced3b69631a55e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Jul 2022 10:15:27 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-activation?expand=0&rev=13 --- glassfish-activation.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glassfish-activation.spec b/glassfish-activation.spec index 75130e9..fba8dc5 100644 --- a/glassfish-activation.spec +++ b/glassfish-activation.spec @@ -106,7 +106,7 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -r activation/target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir} -%triggerpostun -- gnu-jaf +%triggerpostun api -- gnu-jaf if [ -f %{_javadir}/%{name}-api.jar ] ; then if [ -f %{_javadir}/jaf.jar ] ; then rm -f %{_javadir}/jaf.jar