commit scala for openSUSE:Factory
Hello community,
here is the log from the commit of package scala for openSUSE:Factory checked
in at 2020-06-26 21:49:54
Comparing /work/SRC/openSUSE:Factory/scala (Old)
and /work/SRC/openSUSE:Factory/.scala.new.3060 (New)
Package is "scala"
Fri Jun 26 21:49:54 2020 rev:6 rq:817260 version:2.10.7
Changes:
--- /work/SRC/openSUSE:Factory/scala/scala.changes 2019-12-17
13:30:09.975409165 +0100
+++ /work/SRC/openSUSE:Factory/.scala.new.3060/scala.changes2020-06-26
21:50:17.682763925 +0200
@@ -1,0 +2,7 @@
+Fri Jun 26 12:30:08 UTC 2020 - Dominique Leuenberger
+
+- No loner package /usr/share/mime-info: this came from GNOME 1
+ times which are long gone (boo#1062631).
+ + Drop scala.keys and scala.mime source files.
+
+---
Old:
scala.keys
scala.mime
Other differences:
--
++ scala.spec ++
--- /var/tmp/diff_new_pack.V8O3iC/_old 2020-06-26 21:50:18.918767903 +0200
+++ /var/tmp/diff_new_pack.V8O3iC/_new 2020-06-26 21:50:18.922767915 +0200
@@ -1,7 +1,7 @@
#
# spec file for package scala
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -41,8 +41,6 @@
# 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
-Source21: scala.keys
-Source22: scala.mime
Source23: scala-mime-info.xml
Source24: scala.ant.d
# Change the default classpath (SCALA_HOME)
@@ -243,9 +241,6 @@
install -p -m 644 %{SOURCE24} %{buildroot}%{_sysconfdir}/ant.d/scala
%endif
-install -d %{buildroot}%{_datadir}/mime-info
-install -p -m 644 %{SOURCE21} %{SOURCE22} %{buildroot}%{_datadir}/mime-info/
-
install -d %{buildroot}%{_datadir}/mime/packages/
install -p -m 644 %{SOURCE23} %{buildroot}%{_datadir}/mime/packages/
@@ -262,7 +257,6 @@
%dir %{_datadir}/%{base_name}/lib
%{_datadir}/%{base_name}/lib/*.jar
%exclude %{_datadir}/%{base_name}/lib/scala-swing.jar
-%{_datadir}/mime-info
%{_datadir}/mime/packages/*
%license docs/LICENSE
%if %{without bootstrap}
commit scala for openSUSE:Factory
Hello community,
here is the log from the commit of package scala for openSUSE:Factory checked
in at 2019-12-17 13:29:52
Comparing /work/SRC/openSUSE:Factory/scala (Old)
and /work/SRC/openSUSE:Factory/.scala.new.4691 (New)
Package is "scala"
Tue Dec 17 13:29:52 2019 rev:5 rq:757444 version:2.10.7
Changes:
--- /work/SRC/openSUSE:Factory/scala/scala.changes 2019-12-14
12:23:27.739198569 +0100
+++ /work/SRC/openSUSE:Factory/.scala.new.4691/scala.changes2019-12-17
13:30:09.975409165 +0100
@@ -1,0 +2,8 @@
+Tue Dec 17 06:34:27 UTC 2019 - Fridrich Strba
+
+- Stop overriding default fuzz in spec file
+- Changed patch:
+ * scala-2.10.7-source6.patch
++ Refresh using source service
+
+---
Other differences:
--
++ scala.spec ++
--- /var/tmp/diff_new_pack.s81dEv/_old 2019-12-17 13:30:11.379408671 +0100
+++ /var/tmp/diff_new_pack.s81dEv/_new 2019-12-17 13:30:11.379408671 +0100
@@ -137,9 +137,6 @@
the Scala ant tasks.
%prep
-
-%global _default_patch_fuzz 2
-
%setup -q -n %{base_name}-%{version}
%patch1 -p1 -b .tool
%patch2 -p1 -b .sysjline
++ scala-2.10.7-source6.patch ++
--- /var/tmp/diff_new_pack.s81dEv/_old 2019-12-17 13:30:11.483408634 +0100
+++ /var/tmp/diff_new_pack.s81dEv/_new 2019-12-17 13:30:11.483408634 +0100
@@ -1,6 +1,8 @@
scala-2.10.7/build.xml 2019-11-27 17:42:56.487021401 +0100
-+++ scala-2.10.7/build.xml 2019-11-27 17:43:39.491264930 +0100
-@@ -757,7 +757,7 @@
+Index: scala-2.10.7/build.xml
+===
+--- scala-2.10.7.orig/build.xml
scala-2.10.7/build.xml
+@@ -758,7 +758,7 @@ TODO:
destdir="${@{project}-classes}"
classpath="${@{project}-classes}"
includes="**/*.java"
@@ -9,7 +11,7 @@
compiler="javac1.6"
includeantruntime="false" >
-@@ -793,7 +793,7 @@
+@@ -794,7 +794,7 @@ TODO:
includes="**/*.java"
excludes="@{excludes}"
includeantruntime="false"
commit scala for openSUSE:Factory
Hello community,
here is the log from the commit of package scala for openSUSE:Factory checked
in at 2019-12-14 12:17:54
Comparing /work/SRC/openSUSE:Factory/scala (Old)
and /work/SRC/openSUSE:Factory/.scala.new.4691 (New)
Package is "scala"
Sat Dec 14 12:17:54 2019 rev:4 rq:756800 version:2.10.7
Changes:
--- /work/SRC/openSUSE:Factory/scala/scala.changes 2019-12-04
14:21:08.614476753 +0100
+++ /work/SRC/openSUSE:Factory/.scala.new.4691/scala.changes2019-12-14
12:23:27.739198569 +0100
@@ -1,0 +2,5 @@
+Fri Dec 13 11:11:24 UTC 2019 - Guillaume GARDET
+
+- Add _constraints to avoid long builds because of swapping
+
+---
New:
_constraints
Other differences:
--
++ scala.spec ++
--- /var/tmp/diff_new_pack.SbOpSH/_old 2019-12-14 12:23:28.651198430 +0100
+++ /var/tmp/diff_new_pack.SbOpSH/_new 2019-12-14 12:23:28.655198430 +0100
@@ -110,8 +110,8 @@
%package swing
Summary:The swing library for the Scala programming languages
Group: Development/Libraries/Java
-Requires: java >= 1.7
Requires: %{name} = %{version}-%{release}
+Requires: java >= 1.7
%if %{without bootstrap}
Obsoletes: %{base_name}-bootstrap-swing
%endif
++ _constraints ++
3
3
commit scala for openSUSE:Factory
Hello community,
here is the log from the commit of package scala for openSUSE:Factory checked
in at 2019-12-04 13:56:02
Comparing /work/SRC/openSUSE:Factory/scala (Old)
and /work/SRC/openSUSE:Factory/.scala.new.4691 (New)
Package is "scala"
Wed Dec 4 13:56:02 2019 rev:3 rq:753931 version:2.10.7
Changes:
--- /work/SRC/openSUSE:Factory/scala/scala.changes 2019-12-03
12:41:34.082146301 +0100
+++ /work/SRC/openSUSE:Factory/.scala.new.4691/scala.changes2019-12-04
14:21:08.614476753 +0100
@@ -1,0 +2,10 @@
+Wed Dec 4 09:21:06 UTC 2019 - Dominique Leuenberger
+
+- Have scala-bootstrap-swing require scala*bootstrap and
+ scala-swing require scala. There is not guarantee that the
+ rebuild counters between scala and scala-bootstrap would be in
+ sync, making the Requires: scala = %{version}-%{release} for
+ scala-bootstrap unresolvable (let alone that it would not be
+ usable before scala is built)
+
+---
Other differences:
--
++ scala.spec ++
--- /var/tmp/diff_new_pack.CFBROH/_old 2019-12-04 14:21:09.882477822 +0100
+++ /var/tmp/diff_new_pack.CFBROH/_new 2019-12-04 14:21:09.886477825 +0100
@@ -111,7 +111,7 @@
Summary:The swing library for the Scala programming languages
Group: Development/Libraries/Java
Requires: java >= 1.7
-Requires: scala = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%if %{without bootstrap}
Obsoletes: %{base_name}-bootstrap-swing
%endif
commit scala for openSUSE:Factory
Hello community,
here is the log from the commit of package scala for openSUSE:Factory checked
in at 2019-12-03 12:40:27
Comparing /work/SRC/openSUSE:Factory/scala (Old)
and /work/SRC/openSUSE:Factory/.scala.new.4691 (New)
Package is "scala"
Tue Dec 3 12:40:27 2019 rev:2 rq:752799 version:2.10.7
Changes:
--- /work/SRC/openSUSE:Factory/scala/scala.changes 2019-03-28
22:48:20.555058481 +0100
+++ /work/SRC/openSUSE:Factory/.scala.new.4691/scala.changes2019-12-03
12:41:34.082146301 +0100
@@ -1,0 +2,35 @@
+Fri Nov 29 10:53:22 UTC 2019 - Fridrich Strba
+
+- Do not package ant tasks in bootstrap build
+- Added patch:
+ * scala-2.10.7-java8compat.patch
++ Build binaries compatible with java 8 even when building
+ with jdk >= 9
+
+---
+Thu Nov 28 14:27:20 UTC 2019 - Fridrich Strba
+
+- Upgrade to upstream version 2.10.7
+ * Can be built and used with java 11
+- Get sources by a source service instead of a custom script
+- Clean a bit the spec file and remove unnecessary sources
+- Added patches:
+ * scala-2.10.7-source6.patch
++ Build not only with target level 6, but also with source
+ level 6, in order to be able to build with jdk9+
+ * scala-2.10.7-lines.patch
++ Fix type conflict with jdk11's java.lang.String.lines
+
+---
+Tue Nov 26 10:56:50 UTC 2019 - Fridrich Strba
+
+- Do not build api documentation in bootstrap flavour
+- Be extra verbose for the scalac build
+ * The build is long on non-JIT architectures and OBS needs some
+compiler output in order to know that the job is not dead;
+otherwise it kills it.
+- Do not build apidocs to avoid intermittent internal scaladoc
+ errors after hours of build on s390x
+- Remove obsolete scriptlets
+
+---
Old:
generate-tarball.sh
get-source.sh
scala-2.10.3-bootstrap.tgz
scala-2.10.4.tgz
scala-2.10.6.tar.gz
scala-bootstript.xml
New:
_service
scala-2.10.7-java8compat.patch
scala-2.10.7-lines.patch
scala-2.10.7-source6.patch
scala-2.10.7.tar.xz
scala-2.10.7.tgz
Other differences:
--
++ scala.spec ++
--- /var/tmp/diff_new_pack.LfC8rM/_old 2019-12-03 12:41:38.458145089 +0100
+++ /var/tmp/diff_new_pack.LfC8rM/_new 2019-12-03 12:41:38.458145089 +0100
@@ -1,7 +1,7 @@
#
# spec file for package scala
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# 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
@@ -29,34 +29,22 @@
%global jline2_jar %{_javadir}/jline/jline.jar
%global scaladir %{_datadir}/scala
%global base_name scala
-%global want_jdk8 1
%define __requires_exclude .*org\.apache\.ant.*
-Version:2.10.6
+Version:2.10.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:http://www.scala-lang.org/
-# ./generate-tarball.sh
-Source0:%{base_name}-%{version}.tar.gz
+Source0:%{base_name}-%{version}.tar.xz
Source1:scala-library-2.10.0-bnd.properties
-# Bootstrap file generated by ./get-sources.sh
-Source2:scala-2.10.3-bootstrap.tgz
-# git information generated by ./get-sources.sh
+# git log --pretty=format:"%H%n%ci" v%{version} | head -n 2 | sed -e 's/\-//g'
-e 's/\s\+.*//g'
Source3:scala.gitinfo
-# we need this binary copy of the scala 2.10.4 compiler
-# for bootstrapping under Java 8; this can be removed if
-# necessary after Scala 2.10.5 is released if it uses 2.10.4
-# for bootstrapping.
-Source4:http://www.scala-lang.org/files/archive/scala-2.10.4.tgz
-# Remove bundled binaries which are possibly proprietary
-Source5:generate-tarball.sh
-Source6:get-source.sh
+Source4:
http://www.scala-lang.org/files/archive/%{base_name}-%{version}.tgz
Source21: scala.keys
Source22: scala.mime
Source23: scala-mime-info.xml
Source24: scala.ant.d
-Source31: scala-bootstript.xml
# Change the default classpath (SCALA_HOME)
Patch1: scala-2.10.0-tooltemplate.patch
# Use system jline2 instead of bundled jline2
@@ -71,6 +59,9 @@
# Stop scaladoc from trying to bundle non-existent resources that were
# removed due to being in object form only, whithout sources
Patch9: scala-2.10.6-scaladoc-resources.patch
+Patch10:scala-2.10.7-source6.patch
+Patch11:scala-2.10.7-lines.patch
+Patch12:scal
