pool/scala
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=51

Browse Source
This commit is contained in:
Fridrich Strba 2022-05-16 11:29:22 +00:00 committed by Git OBS Bridge
parent dc3f0f6c89
commit 7e0aac2028
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scala.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 16 11:28:03 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Fix the scala build to find correctly the jansi.jar file
- Make the package that links the jansi.jar file archfull
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 29 21:25:14 UTC 2021 - Fridrich Strba <fstrba@suse.com> Thu Jul 29 21:25:14 UTC 2021 - Fridrich Strba <fstrba@suse.com>

8
scala.spec
View File

@ -1,7 +1,7 @@
# #
# spec file # spec file
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -25,7 +25,7 @@
%global fullversion %{version} %global fullversion %{version}
%global release_repository http://nexus.scala-tools.org/content/repositories/releases %global release_repository http://nexus.scala-tools.org/content/repositories/releases
%global snapshot_repository http://nexus.scala-tools.org/content/repositories/snapshots %global snapshot_repository http://nexus.scala-tools.org/content/repositories/snapshots
%global jansi_jar %{_javadir}/jansi/jansi.jar %global jansi_jar %{_jnidir}/jansi/jansi.jar
%global jline2_jar %{_javadir}/jline/jline.jar %global jline2_jar %{_javadir}/jline/jline.jar
%global scaladir %{_datadir}/scala %global scaladir %{_datadir}/scala
%global base_name scala %global base_name scala
@ -77,7 +77,6 @@ Requires: java-headless >= 1.7
# /usr/share/java-utils/java-functions # /usr/share/java-utils/java-functions
Requires: javapackages-tools Requires: javapackages-tools
Requires: jline >= 2.10 Requires: jline >= 2.10
BuildArch: noarch
%if %{with bootstrap} %if %{with bootstrap}
Source100: scala-compiler.jar Source100: scala-compiler.jar
Source101: scala-library.jar Source101: scala-library.jar
@ -103,6 +102,7 @@ is also interoperable with Java.
Summary: Documentation for the Scala programming language Summary: Documentation for the Scala programming language
Group: Documentation/HTML Group: Documentation/HTML
Obsoletes: %{base_name}-bootstrap-apidoc Obsoletes: %{base_name}-bootstrap-apidoc
BuildArch: noarch
%description apidoc %description apidoc
Scala is a general purpose programming language for the JVM that blends Scala is a general purpose programming language for the JVM that blends
@ -115,6 +115,7 @@ Summary: The swing library for the Scala programming languages
Group: Development/Libraries/Java Group: Development/Libraries/Java
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: java >= 1.7 Requires: java >= 1.7
BuildArch: noarch
%if %{without bootstrap} %if %{without bootstrap}
Obsoletes: %{base_name}-bootstrap-swing Obsoletes: %{base_name}-bootstrap-swing
%endif %endif
@ -130,6 +131,7 @@ Summary: Development files for Scala
Group: Development/Libraries/Java Group: Development/Libraries/Java
Requires: ant Requires: ant
Requires: scala = %{version}-%{release} Requires: scala = %{version}-%{release}
BuildArch: noarch
%if %{without bootstrap} %if %{without bootstrap}
Obsoletes: ant-%{base_name}-bootstrap Obsoletes: ant-%{base_name}-bootstrap
%endif %endif