Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-04-05 15:33:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab" Thu Apr 5 15:33:32 2018 rev:26 rq:593521 version:6.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2018-03-14 19:40:17.994512351 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2018-04-05 15:33:35.399929170 +0200 @@ -1,0 +2,9 @@ +Wed Apr 4 10:30:35 UTC 2018 - fst...@suse.com + +- Add scilab-java_source_target.patch: Build with source and target + 6 in order to avoid runtime errors with unrecognized class + version. +- Make build with any java-devel >= 9 for openSUSE >= 1500, in + order not to depend on a particular exact java version. + +------------------------------------------------------------------- New: ---- scilab-java_source_target.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.ZzOdvI/_old 2018-04-05 15:33:37.127866719 +0200 +++ /var/tmp/diff_new_pack.ZzOdvI/_new 2018-04-05 15:33:37.131866574 +0200 @@ -64,6 +64,8 @@ Patch24: scilab-xcos-java9.patch # PATCH-FIX-UPSTREAM scilab-java9-ClassLoader.patch badshah...@gmail.com -- Hack frontloading of all necessary jar classpaths by passing them to _JAVA_OPTIONS since dynamic classpath loading doesn not work any more; see http://mailinglists.scilab.org/Scilab-GUI-and-adv-cli-fail-to-launch-with-java-9-td4037645.html Patch25: scilab-java9-ClassLoader.patch +# PATCH-FIX-OPENSUSE scilab-java_source_target.patch fridrich.st...@suse.com -- Build with source and target 6 in order to avoid runtime errors of unrecognized bytecode +Patch26: scilab-java_source_target.patch ExcludeArch: i586 ppc64 # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" @@ -96,7 +98,7 @@ BuildRequires: ant BuildRequires: ecj %if 0%{?suse_version} >= 1500 -BuildRequires: java-devel = 9 +BuildRequires: java-devel >= 9 %else BuildRequires: java-devel = 1.8.0 %endif @@ -327,6 +329,7 @@ %patch24 -p1 %patch25 -p1 %endif +%patch26 -p1 # Remove a bad merge remnant (.orig file) to prevent trigerring rpmlint's suse-filelist-forbidden rm ./modules/cacsd/tests/unit_tests/dscr.tst.orig ++++++ scilab-java_source_target.patch ++++++ --- scilab-6.0.1/modules/scirenderer/build.xml 2018-02-15 09:40:51.000000000 +0100 +++ scilab-6.0.1/modules/scirenderer/build.xml 2018-03-20 16:39:49.477864166 +0100 @@ -102,7 +102,7 @@ <!-- Compile sources --> <target name="compile" description="Build sources" depends="init"> - <javac + <javac source="6" target="6" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="compile.classpath" @@ -118,7 +118,7 @@ <!-- Compile examples --> <target name="compile-examples" description="Build the examples" depends="compile"> - <javac + <javac source="6" target="6" srcdir="${src.examples.dir}" destdir="${classes.dir}" classpathref="compile.classpath" @@ -143,7 +143,7 @@ <mkdir dir="${build.test.dir}"/> <!-- clean the test to make sure it will build properly --> - <javac + <javac source="6" target="6" srcdir="${src.examples.dir}" destdir="${classes.test.dir}" deprecation="on" @@ -178,7 +178,7 @@ </target> <target name="doc"> - <javadoc + <javadoc source="6" destdir="${doc.dir}" author="true" version="true" ++++++ scilab-openjdk9-no-javah.patch ++++++ --- /var/tmp/diff_new_pack.ZzOdvI/_old 2018-04-05 15:33:37.195864262 +0200 +++ /var/tmp/diff_new_pack.ZzOdvI/_new 2018-04-05 15:33:37.199864117 +0200 @@ -12,7 +12,7 @@ =================================================================== --- scilab-6.0.1.orig/configure +++ scilab-6.0.1/configure -@@ -12987,100 +12987,7 @@ fi +@@ -12987,100 +12987,6 @@ fi JAVA_G=$JAVA fi @@ -110,7 +110,6 @@ - fi - - -+ JAVAH="$JAVAC -h" if test "$cross_compiling" = "yes" ; then
