From 7cf63fe3b11f44f29ad1db356ba4496cf62c92ebfb30d8ae2628d05aedf6f329 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 06:49:51 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=61 --- scala.changes | 15 +++++++++++++++ scala.spec | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/scala.changes b/scala.changes index d616040..8257aee 100644 --- a/scala.changes +++ b/scala.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Sep 29 06:45:12 UTC 2023 - Fridrich Strba + +- Allow building with jdk >= 9 too +- Added patch: + * scala-2.10.7-jdk15.patch + + do not build pack200 ant task since Pack200 was removed in + jdk15 + + implement a new method added in jdk15 +- Modified patches: + * scala-2.10.4-build_xml.patch + + do not try to instantiate the pack200 ant task + * scala-2.10.7-source6.patch -> scala-2.10.7-source8.patch + + build with source/target 8 levels + ------------------------------------------------------------------- Mon Sep 11 13:07:40 UTC 2023 - Fridrich Strba diff --git a/scala.spec b/scala.spec index 4e8fe28..d390c53 100644 --- a/scala.spec +++ b/scala.spec @@ -66,12 +66,12 @@ BuildRequires: ant-contrib BuildRequires: ant-junit BuildRequires: aqute-bnd BuildRequires: graphviz -BuildRequires: java-devel >= 1.7 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: jline >= 2.10 BuildRequires: junit Requires: jansi -Requires: java-headless >= 1.7 +Requires: java-headless >= 1.8 # Require full javapackages-tools since scripts use # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -113,7 +113,7 @@ reference and API documentation for the Scala programming language. Summary: The swing library for the Scala programming languages Group: Development/Libraries/Java Requires: %{name} = %{version}-%{release} -Requires: java >= 1.7 +Requires: java >= 1.8 BuildArch: noarch %if %{without bootstrap} Obsoletes: %{base_name}-bootstrap-swing