Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package scala for openSUSE:Factory checked in at 2021-07-30 23:22:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scala (Old)
and /work/SRC/openSUSE:Factory/.scala.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scala"
Fri Jul 30 23:22:23 2021 rev:7 rq:909398 version:2.10.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/scala/scala.changes 2020-06-26 21:50:17.682763925 +0200
+++ /work/SRC/openSUSE:Factory/.scala.new.1899/scala.changes 2021-07-30 23:22:54.199588513 +0200
@@ -1,0 +2,6 @@
+Thu Jul 29 21:25:14 UTC 2021 - Fridrich Strba
+
+- Bootstrap the build with our own built jar instead of downloading
+ prebuilt binaries from www.scala-lang.org
+
+-------------------------------------------------------------------
Old:
----
scala-2.10.7.tgz
New:
----
scala-compiler.jar
scala-library.jar
scala-reflect.jar
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scala.spec ++++++
--- /var/tmp/diff_new_pack.D5GiPe/_old 2021-07-30 23:22:54.803587850 +0200
+++ /var/tmp/diff_new_pack.D5GiPe/_new 2021-07-30 23:22:54.807587846 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package scala
+# spec file
#
-# Copyright (c) 2020 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
@@ -35,12 +35,11 @@
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: http://www.scala-lang.org/
+URL: https://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'
Source3: scala.gitinfo
-Source4: http://www.scala-lang.org/files/archive/%{base_name}-%{version}.tgz
Source23: scala-mime-info.xml
Source24: scala.ant.d
# Change the default classpath (SCALA_HOME)
@@ -69,6 +68,9 @@
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
@@ -77,6 +79,11 @@
Requires: jline >= 2.10
BuildArch: noarch
%if %{with bootstrap}
+Source100: scala-compiler.jar
+Source101: scala-library.jar
+Source102: scala-reflect.jar
+%endif
+%if %{with bootstrap}
Name: %{base_name}-bootstrap
%else
Name: %{base_name}
@@ -95,9 +102,7 @@
%package apidoc
Summary: Documentation for the Scala programming language
Group: Documentation/HTML
-%if %{without bootstrap}
Obsoletes: %{base_name}-bootstrap-apidoc
-%endif
%description apidoc
Scala is a general purpose programming language for the JVM that blends
@@ -159,7 +164,6 @@
%if %{with bootstrap}
%global do_bootstrap -DdoBootstrapBuild=yes
%global docs_target %{nil}
-tar -xzvf %{SOURCE4} --strip-components=1 %{base_name}-%{version}/lib
%else
%global do_bootstrap %{nil}
%global docs_target docs
@@ -173,6 +177,10 @@
ln -s $(find-jar scala/scala-library) scala-library.jar
rm -rf scala-reflect.jar
ln -s $(find-jar scala/scala-reflect) scala-reflect.jar
+%else
+ cp %{SOURCE100} scala-compiler.jar
+ cp %{SOURCE101} scala-library.jar
+ cp %{SOURCE102} scala-reflect.jar
%endif
pushd ant
rm -rf ant.jar
@@ -195,7 +203,7 @@
# 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
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.D5GiPe/_old 2021-07-30 23:22:54.831587820 +0200
+++ /var/tmp/diff_new_pack.D5GiPe/_new 2021-07-30 23:22:54.831587820 +0200
@@ -1,10 +1,10 @@
<constraints>
<hardware>
<physicalmemory>
- <size unit="G">3</size>
+ <size unit="G">4</size>
</physicalmemory>
<disk>
- <size unit="G">3</size>
+ <size unit="G">4</size>
</disk>
</hardware>
</constraints>