From a4df3295df1a9da4086b97b774f90c6208efd68462294dea67f1c1b187ebe59e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 8 Mar 2022 11:46:00 +0000
Subject: [PATCH 1/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=48

---
 scala.spec | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scala.spec b/scala.spec
index 44f6ddb..ca7ce7d 100644
--- a/scala.spec
+++ b/scala.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -68,9 +68,6 @@ BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
 BuildRequires:  jline >= 2.10
 BuildRequires:  junit
-BuildConflicts: java >= 9
-BuildConflicts: java-devel >= 9
-BuildConflicts: java-headless >= 9
 Requires:       jansi
 Requires:       java-headless >= 1.7
 # Require full javapackages-tools since scripts use

From 4957892e1ad6a4f97edf79c55fbf492bdb5a271bf717a1e6f12c36ea97af09b7 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 8 Mar 2022 12:24:16 +0000
Subject: [PATCH 2/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=49

---
 scala.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scala.spec b/scala.spec
index ca7ce7d..9168734 100644
--- a/scala.spec
+++ b/scala.spec
@@ -68,6 +68,9 @@ BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
 BuildRequires:  jline >= 2.10
 BuildRequires:  junit
+BuildConflicts: java >= 9
+BuildConflicts: java-devel >= 9
+BuildConflicts: java-headless >= 9
 Requires:       jansi
 Requires:       java-headless >= 1.7
 # Require full javapackages-tools since scripts use

From dc3f0f6c89b94bb06f4564be76d9c4ae71f1fca6cf897d89baec767f880d96f5 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 8 Mar 2022 12:25:25 +0000
Subject: [PATCH 3/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=50

---
 scala.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scala.spec b/scala.spec
index 9168734..44f6ddb 100644
--- a/scala.spec
+++ b/scala.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

From 7e0aac2028ce12b8e12c519e8c2bc442c818615911a59ef32885b3d4de0c8a5e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 16 May 2022 11:29:22 +0000
Subject: [PATCH 4/4] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=51

---
 scala.changes | 6 ++++++
 scala.spec    | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/scala.changes b/scala.changes
index 94e0a46..a67594a 100644
--- a/scala.changes
+++ b/scala.changes
@@ -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>
 
diff --git a/scala.spec b/scala.spec
index 44f6ddb..b423c90 100644
--- a/scala.spec
+++ b/scala.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 %global fullversion %{version}
 %global release_repository http://nexus.scala-tools.org/content/repositories/releases
 %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 scaladir %{_datadir}/scala
 %global base_name scala
@@ -77,7 +77,6 @@ Requires:       java-headless >= 1.7
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
 Requires:       jline >= 2.10
-BuildArch:      noarch
 %if %{with bootstrap}
 Source100:      scala-compiler.jar
 Source101:      scala-library.jar
@@ -103,6 +102,7 @@ is also interoperable with Java.
 Summary:        Documentation for the Scala programming language
 Group:          Documentation/HTML
 Obsoletes:      %{base_name}-bootstrap-apidoc
+BuildArch:      noarch
 
 %description apidoc
 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
 Requires:       %{name} = %{version}-%{release}
 Requires:       java >= 1.7
+BuildArch:      noarch
 %if %{without bootstrap}
 Obsoletes:      %{base_name}-bootstrap-swing
 %endif
@@ -130,6 +131,7 @@ Summary:        Development files for Scala
 Group:          Development/Libraries/Java
 Requires:       ant
 Requires:       scala = %{version}-%{release}
+BuildArch:      noarch
 %if %{without bootstrap}
 Obsoletes:      ant-%{base_name}-bootstrap
 %endif