Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-03-08 10:58:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab" Thu Mar 8 10:58:43 2018 rev:24 rq:583871 version:6.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2018-03-04 12:50:17.172658673 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2018-03-08 10:58:43.610673836 +0100 @@ -1,0 +2,23 @@ +Mon Feb 26 12:29:17 UTC 2018 - [email protected] + +- Update License in keeping with upstream: Scilab is now + distributed under the terms of GPL-2.0. +- Modify scilab-launch-from-xterm.patch: also add scinotes and + xcos desktop launchers to patch, and make them launch via xterm; + add xterm to Requires. +- Modify scilab-openjdk9-no-javah.patch: enclose JAVAH variable + declaration in quotes. +- Document the addition of jaf = 1.1 to [Build]Requires; added in + previous commit, and required for building documentation in + conjunction with scilab-java9-ClassLoader.patch; not required + for openSUSE < 1500 where jdk 1.8 is used. +- Restore sed commands to clear Class-Path from Manifest files; + this was erroneously removed in previous commit. +- Use jdk 9 only for openSUSE >= 1500; disable patches relating + to jdk 9+ for older openSUSE. +- Enforce minimum version on eigen3-devel BuildRequires: at least + version 3.3.2 required. +- Add i586 to ExcludeArch, building no longer supported by + upstream. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.SVKamo/_old 2018-03-08 10:58:45.378609932 +0100 +++ /var/tmp/diff_new_pack.SVKamo/_new 2018-03-08 10:58:45.382609787 +0100 @@ -22,7 +22,7 @@ Name: scilab Summary: High Level Programming Language/Numerical Analysis Software -License: CECILL-2.0 and BSD-3-Clause +License: GPL-2.0 AND BSD-3-Clause Group: Productivity/Scientific/Math Version: 6.0.1 Release: 0 @@ -66,12 +66,12 @@ Patch24: scilab-xcos-java9.patch # PATCH-FIX-UPSTREAM scilab-java9-ClassLoader.patch [email protected] -- 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 -ExcludeArch: ppc64 +ExcludeArch: i586 ppc64 # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory BuildRequires: asm2 -BuildRequires: eigen3-devel +BuildRequires: eigen3-devel >= 3.3.2 BuildRequires: f2c BuildRequires: gcc BuildRequires: gcc-c++ @@ -97,7 +97,11 @@ # GUI/Console BuildRequires: ant BuildRequires: ecj +%if 0%{?suse_version} >= 1500 BuildRequires: java-devel = 9 +%else +BuildRequires: java-devel = 1.8.0 +%endif BuildRequires: jpackage-utils BuildRequires: lucene >= 6.0 BuildRequires: lucene-analyzers-common >= 6.0 @@ -158,9 +162,11 @@ Requires: saxon9 #BuildRequires: docbook-style-xsl BuildRequires: docbook-xsl-stylesheets +%if 0%{?suse_version} >= 1500 BuildRequires: jaf = 1.1 -BuildRequires: liberation-fonts Requires: jaf = 1.1 +%endif +BuildRequires: liberation-fonts # make doc now requires access to display BuildRequires: Mesa-libGL-devel BuildRequires: xorg-x11-server @@ -315,13 +321,21 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +# JAVA 9 IS ONLY USED FOR openSUSE >= 1500 +%if 0%{?suse_version} >= 1500 %patch23 -p1 %patch24 -p1 %patch25 -p1 +%endif # Remove a bad merge remnant (.orig file) to prevent trigerring rpmlint's suse-filelist-forbidden rm ./modules/cacsd/tests/unit_tests/dscr.tst.orig +# Fix Class-Path in manifest +sed -i '/name="Class-Path"/d' build.incl.xml +sed -i '/name="Class-Path"/d' modules/javasci/build.xml +sed -i '/name="Class-Path"/d' modules/scirenderer/build.xml + %build %configure \ --disable-static-system-lib \ @@ -332,10 +346,13 @@ make -C modules/scicos modelicac modelicat XML2Modelica make %{?_smp_mflags} +# JAVA 9 IS ONLY USED FOR openSUSE >= 1500 +%if 0%{?suse_version} >= 1500 export SCI_ALL_JAR_CLASSPATHS=`grep -Eo "\".*.jar" etc/classpath.xml | sed 's/$SCILAB/$SCI/' | tr -d "\"" | tr "\n" ":"` sed -i "s|@SPEC_ALL_JAR_CLASSPATHS@|${SCI_ALL_JAR_CLASSPATHS}|" bin/scilab export SCI_LIB_PATH=%{_libdir}/scilab sed -i "s|@SPEC_SCI_LIB_PATH@|${SCI_LIB_PATH}|" bin/scilab +%endif # SED HACK TO FRONTLOAD ALL NECESSARY JARS WHEN STARTING SCILAB # See discussion http://mailinglists.scilab.org/Scilab-GUI-and-adv-cli-fail-to-launch-with-java-9-td4037645.html @@ -344,9 +361,12 @@ export DISPLAY=%{X_display} Xvfb %{X_display} >& Xvfb.log & sleep 5 +# JAVA 9 IS ONLY USED FOR openSUSE >= 1500 +%if 0%{?suse_version} >= 1500 export SCI_ALL_JAR_CLASSPATHS=`grep -Eo "\".*.jar" etc/classpath.xml | sed 's/$SCILAB/./' | tr -d "\"" | tr "\n" ":"` export LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:./modules/*/.libs:./modules/.libs export _JAVA_OPTIONS='-Djava.class.path=${SCI_ALL_JAR_CLASSPATHS}' +%endif make doc SCIVERBOSE=1 %install @@ -410,11 +430,9 @@ make check %endif -%post -n %{soname} -/sbin/ldconfig +%post -n %{soname} -p /sbin/ldconfig -%postun -n %{soname} -/sbin/ldconfig +%postun -n %{soname} -p /sbin/ldconfig %files -n %{soname} %defattr(-,root,root) ++++++ scilab-launch-from-xterm.patch ++++++ --- /var/tmp/diff_new_pack.SVKamo/_old 2018-03-08 10:58:45.458607041 +0100 +++ /var/tmp/diff_new_pack.SVKamo/_new 2018-03-08 10:58:45.462606895 +0100 @@ -11,3 +11,29 @@ GenericName=Scientific Software Package GenericName[fr]=Logiciel de calcul numérique GenericName[de]=Wissenschaftssoftware +Index: scilab-6.0.1/desktop/scinotes.desktop +=================================================================== +--- scilab-6.0.1.orig/desktop/scinotes.desktop ++++ scilab-6.0.1/desktop/scinotes.desktop +@@ -2,7 +2,7 @@ + Comment=Scilab text editor + Comment[fr]=Editeur de texte Scilab + Comment[ru]=Текстовый редактор Scilab +-Exec=scinotes ++Exec=xterm -title "Scilab launcher: DO NOT CLOSE" -e scinotes + GenericName=Scientific Software Package + GenericName[fr]=Logiciel de calcul numérique + GenericName[de]=Wissenschaftssoftware +Index: scilab-6.0.1/desktop/xcos.desktop +=================================================================== +--- scilab-6.0.1.orig/desktop/xcos.desktop ++++ scilab-6.0.1/desktop/xcos.desktop +@@ -1,7 +1,7 @@ + [Desktop Entry] + Comment=Hybrid simulator + Comment[ru]=Гибридный симулятор +-Exec=xcos ++Exec=xterm -title "Scilab launcher: DO NOT CLOSE" -e xcos + GenericName=Scientific Software Package + GenericName[fr]=Logiciel de calcul numérique + GenericName[de]=Wissenschaftssoftware ++++++ scilab-openjdk9-no-javah.patch ++++++ --- /var/tmp/diff_new_pack.SVKamo/_old 2018-03-08 10:58:45.474606462 +0100 +++ /var/tmp/diff_new_pack.SVKamo/_new 2018-03-08 10:58:45.474606462 +0100 @@ -110,7 +110,7 @@ - fi - - -+ JAVAH=$JAVAC -h ++ JAVAH="$JAVAC -h" if test "$cross_compiling" = "yes" ; then
