From c4ee295324f0517432f62d7bd69e905b5a68dbb01264d350cf51da083ec08696 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 17 Feb 2020 09:20:33 +0000
Subject: [PATCH] Syncing with factory

OBS-URL: https://build.opensuse.org/package/show/Java:packages/scala?expand=0&rev=39
---
 scala.spec | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/scala.spec b/scala.spec
index 3146711..35472be 100644
--- a/scala.spec
+++ b/scala.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package scala
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,7 +35,7 @@ Release:        0
 Summary:        A hybrid functional/object-oriented language for the JVM
 License:        BSD-3-Clause AND CC0-1.0 AND SUSE-Public-Domain
 Group:          Development/Libraries/Java
-URL:            https://www.scala-lang.org/
+URL:            http://www.scala-lang.org/
 Source0:        %{base_name}-%{version}.tar.xz
 Source1:        scala-library-2.10.0-bnd.properties
 # git log --pretty=format:"%H%n%ci" v%{version} | head -n 2 | sed -e 's/\-//g' -e 's/\s\+.*//g'
@@ -78,9 +78,6 @@ Requires:       java-headless >= 1.7
 Requires:       javapackages-tools
 Requires:       jline >= 2.10
 BuildArch:      noarch
-%ifarch s390x
-BuildRequires:  java-devel >= 11
-%endif
 %if %{with bootstrap}
 Name:           %{base_name}-bootstrap
 %else
@@ -200,7 +197,7 @@ export ANT_OPTS="-Xms2048m -Xmx2048m %{do_bootstrap}"
 # Add the -verbose flag to scalac on zero architectures. The build
 # is slow, OBS thinks it is stuck and kills it before it has chance
 # to finish
-%{ant} \
+%ant \
 	build %{docs_target} || exit 1
 pushd build/pack/lib
 mv scala-library.jar scala-library.jar.no