From 7da29132f8b8fe4c325aaa066449d4d97dfb807604f749e21e87a58a7aea1d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Wed, 13 Apr 2022 07:24:11 +0000 Subject: [PATCH] Accepting request 969463 from home:fstrba:branches:Base:System Fix build in factory OBS-URL: https://build.opensuse.org/request/show/969463 OBS-URL: https://build.opensuse.org/package/show/Base:System/timezone?expand=0&rev=279 --- timezone-java.changes | 6 ++++++ timezone-java.spec | 6 +++++- timezone-java.spec.in | 6 +++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/timezone-java.changes b/timezone-java.changes index c664a6a..d75803a 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 12 13:56:17 UTC 2022 - Fridrich Strba + +- Add --add-exports for java versions that support it. + * Fixes build in factory, since this is compulsory for jdk17+ + ------------------------------------------------------------------- Thu Mar 17 06:50:19 UTC 2022 - Andreas Stieger diff --git a/timezone-java.spec b/timezone-java.spec index 68a3154..a9f5377 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -66,7 +66,11 @@ echo "tzdata%{version}" >> VERSION %build # Java 6/7 data -java -jar %{_javadir}/javazic.jar -V %{version} \ +java \ +%if %{?pkg_vcmp:%pkg_vcmp java >= 9}%{!?pkg_vcmp:0} + --add-exports=java.base/sun.security.action=ALL-UNNAMED \ +%endif + -jar %{_javadir}/javazic.jar -V %{version} \ -d javazi \ africa antarctica asia australasia europe northamerica \ southamerica backward etcetera \ diff --git a/timezone-java.spec.in b/timezone-java.spec.in index 3d86680..8370c2a 100644 --- a/timezone-java.spec.in +++ b/timezone-java.spec.in @@ -47,7 +47,11 @@ echo "tzdata%{version}" >> VERSION %build # Java 6/7 data -java -jar %{_javadir}/javazic.jar -V %{version} \ +java \ +%if %{?pkg_vcmp:%pkg_vcmp java >= 9}%{!?pkg_vcmp:0} + --add-exports=java.base/sun.security.action=ALL-UNNAMED \ +%endif + -jar %{_javadir}/javazic.jar -V %{version} \ -d javazi \ africa antarctica asia australasia europe northamerica \ southamerica backward etcetera \