Hello community,
here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-12-04 20:58:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/scilab (Old)
and /work/SRC/openSUSE:Factory/.scilab.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab"
Tue Dec 4 20:58:20 2018 rev:29 rq:653852 version:6.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2018-10-15 09:43:17.003382358 +0200
+++ /work/SRC/openSUSE:Factory/.scilab.new.19453/scilab.changes 2018-12-04 20:58:31.440574065 +0100
@@ -1,0 +2,25 @@
+Sat Nov 24 01:21:25 UTC 2018 - badshah400@gmail.com
+
+- Add scilab-dont-test-for-jaf.patch: Disable the autoconf tests
+ for jar-based activation framework (JAF); JAF is available for
+ openjdk-11 (for openSUSE anyway), but uses jmod instead.
+- Change BuildRequires to require java >= 11 following above
+ patch.
+
+-------------------------------------------------------------------
+Mon Nov 12 00:28:27 UTC 2018 - Atri Bhattacharya
+
+- Enforce back java-devel = 10 requirement, JAF not found when
+ building against java-openjdk 11 causing build failures.
+
+-------------------------------------------------------------------
+Sat Nov 3 06:27:25 UTC 2018 - Fridrich Strba
+
+- Build against asm5, which is the newest that we have. In any case
+ the configure does not find cobertura, so this is kind of a moot
+ dependency
+- Build for suse_version >= 1500 with any java-devel >= 9, since
+ we merged back into our java-11-openjdk packages the Java
+ Activation Framework and other selected JavaEE modules
+
+-------------------------------------------------------------------
New:
----
scilab-dont-test-for-jaf.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scilab.spec ++++++
--- /var/tmp/diff_new_pack.iWvKLR/_old 2018-12-04 20:58:32.736572635 +0100
+++ /var/tmp/diff_new_pack.iWvKLR/_new 2018-12-04 20:58:32.736572635 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -68,11 +68,13 @@
Patch26: scilab-java_source_target.patch
# PATCH-FIX-UPSTREAM scilab-gfortran8-errors.patch badshah400@gmail.com -- Fix argument size mismatch in variable sizes; these crop up as errors when compiling against gfortran >= 8.
Patch27: scilab-gfortran8-errors.patch
+# PATCH-FIX-UPSTREAM scilab-dont-test-for-jaf.patch badshah400@gmail.com -- Disable the autoconf tests for jar-based activation framework (JAF); JAF is available for openjdk-11 (for openSUSE anyway), but uses jmod instead
+Patch28: scilab-dont-test-for-jaf.patch
ExcludeArch: i586 ppc64
# Dependencies are extracted from :
# "http://wiki.scilab.org/Dependencies of Scilab 5.X"
# Mandatory
-BuildRequires: asm2
+BuildRequires: asm5
BuildRequires: eigen3-devel >= 3.3.2
BuildRequires: f2c
BuildRequires: gcc
@@ -100,7 +102,7 @@
BuildRequires: ant
BuildRequires: ecj
%if 0%{?suse_version} >= 1500
-BuildRequires: java-devel = 10
+BuildRequires: java-devel >= 11
%else
BuildRequires: java-devel = 1.8.0
%endif
@@ -334,6 +336,7 @@
%endif
%patch26 -p1
%patch27 -p1
+%patch28 -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-dont-test-for-jaf.patch ++++++
Index: scilab-6.0.1/configure
===================================================================
--- scilab-6.0.1.orig/configure
+++ scilab-6.0.1/configure
@@ -809,7 +809,6 @@ FREEHEP_GRAPHICSIO
FREEHEP_GRAPHICS2D
FOP
JEUCLID_CORE
-JAF
JROSETTA_ENGINE
JROSETTA_API
LUCENE_PARSER
@@ -17826,225 +17825,6 @@ $as_echo "$as_me: WARNING: Could not fin
JEUCLID_CORE=$PACKAGE_JAR_FILE
- # JavaBeans Activation Framework
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking jaf" >&5
-$as_echo_n "checking jaf... " >&6; }
- PACKAGE_JAR_FILE=
-
- DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/"
-
- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'jaf.jar' -or -name 'libjaf.jar' -or -name 'libjaf-java.jar' -or -name 'jaf*.jar' \) 2>/dev/null |tr '\n' ':')."
-
- if test ! -f conftestSharedChecker.class ; then
-
- cat << \EOF > conftestSharedChecker.java
-// #line 14982 "configure"
-import java.util.regex.Pattern;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-
-public class conftestSharedChecker {
-
- /**
- * Required arguments :
- * argv[0]: name of the jar package
- * argv[1]: name of the class (with the package prefix)
- * argv[2]: possible paths of the jar package (separated by ':')
- *
- * Optional arguments:
- * argv[3]: field or method used to retrieve the version
- * argv[4]: expected version
- * argv[5]: String comparator :
- * "=" for exact version
- */
- public static void main(String[] argv) {
- final String packageName = argv[0];
- final String className = argv[1];
- final String[] jarList = argv[2].split(":");
-
- ArrayList<URL> found = new ArrayList<>();
- for(String jar : jarList)
- {
- try {
- File f = new File(jar);
- if (f.exists()) {
- found.add(f.toURI().toURL());
- }
- } catch (IOException ex) {
- System.err.println(ex.toString());
- }
- }
-
- URLClassLoader localClassLoader = new URLClassLoader(found.toArray(new URL[found.size()]));
- URL klassURL = null;
- Class<?> klass = null;
- try {
- String resourceName = className.replace(".", "/") + ".class";
- klassURL = localClassLoader.getResource(resourceName);
- klass = localClassLoader.loadClass(className);
- } catch (ClassNotFoundException ex) {
- System.err.println(className + " not found");
- System.exit(-1);
- }
-
- String pathURL = klassURL.getPath().substring(0, klassURL.getPath().indexOf('!'));
- String path = pathURL.substring(pathURL.indexOf(':') + 1);
- System.err.println("found: " + path);
-
- if (argv.length > 3) {
- checkVersion(klass, argv);
- }
-
- System.out.println(path);
- }
-
- private static void checkVersion(Class<?> klass, String[] argv) throws SecurityException, IllegalArgumentException {
- final String versionMethod = argv[3];
- final String expected = argv[4];
- final String atLeastOrEqual;
- if (argv.length > 5)
- atLeastOrEqual = argv[5];
- else
- atLeastOrEqual = "<=";
-
- try {
- try {
- Field field = klass.getField(versionMethod);
- Object value = field.get(null);
- compareAndDisplay(atLeastOrEqual, expected, value);
- } catch (NoSuchFieldException fe) {
- Method method = null;
- try {
- method = klass.getMethod(versionMethod);
- } catch (NoSuchMethodException ex) {
- System.err.println(ex.toString());
- System.exit(-3);
- }
-
- try {
- Object value = method.invoke(null);
- compareAndDisplay(atLeastOrEqual, expected, value);
- } catch (NullPointerException ex) {
- Object value = method.invoke(klass.newInstance());
- compareAndDisplay(atLeastOrEqual, expected, value);
- }
- }
- } catch (IllegalAccessException ex) {
- System.err.println(ex);
- System.exit(-2);
- } catch (InvocationTargetException ex) {
- System.err.println(ex);
- System.exit(-2);
- } catch (InstantiationException ex) {
- System.err.println(ex);
- System.exit(-2);
- }
- }
-
- private static void compareAndDisplay(String atLeastOrEqual, String expected, Object value) {
- int cmp = compare(expected, value.toString());
-
- switch(atLeastOrEqual) {
- case ">":
- if (cmp > 0) {
- return;
- } else {
- System.err.println("expected "+atLeastOrEqual+""+expected+" but got "+value);
- System.exit(-4);
- }
- case "==":
- if (cmp == 0) {
- return;
- } else {
- System.err.println("expected "+atLeastOrEqual+""+expected+" but got "+value);
- System.exit(-4);
- }
- case "<=":
- if (cmp <= 0) {
- return;
- } else {
- System.err.println("expected "+atLeastOrEqual+""+expected+" but got "+value);
- System.exit(-4);
- }
- default:
- System.err.println("unable to compare with "+atLeastOrEqual);
- System.exit(-4);
- }
- }
-
- private static int compare(String v1, String v2) {
- String s1 = normalisedVersion(v1);
- String s2 = normalisedVersion(v2);
-
- System.err.println("compare: " + v1 + " normalised to " + s1);
- System.err.println("compare: " + v2 + " normalised to " + s2);
- return s1.compareTo(s2);
- }
-
- private static String normalisedVersion(String version) {
- return normalisedVersion(version, ".", 4);
- }
-
- private static String normalisedVersion(String version, String sep, int maxWidth) {
- String[] split = Pattern.compile(sep, Pattern.LITERAL).split(version);
- StringBuilder sb = new StringBuilder();
- for (String s : split) {
- sb.append(String.format("%" + maxWidth + 's', s));
- }
- return sb.toString();
- }
-}
-EOF
-
- CLASSPATH=$ac_java_classpath
- export CLASSPATH
- cmd="$JAVAC ${JAVAC_FLAGS} conftestSharedChecker.java"
- if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5) ; then
- echo "configure: conftestSharedChecker.class available" >&5
- else
- echo "configure: failed program was:" >&5
- cat conftestSharedChecker.java >&5
- echo "configure: CLASSPATH was $CLASSPATH" >&5
- fi
-
- fi
-
- CLASSPATH=$ac_java_classpath
- export CLASSPATH
- cmd="$JAVA conftestSharedChecker jaf javax.activation.MimetypesFileTypeMap $jar_resolved "
- if (echo $cmd >&5 ; eval $cmd >conftestSharedChecker.java.output 2>&5); then
- PACKAGE_JAR_FILE=$(tail -n 1 conftestSharedChecker.java.output);
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_JAR_FILE" >&5
-$as_echo "$PACKAGE_JAR_FILE" >&6; }
- echo "yes" >&5
- # append the found file to the classpath to manage jar dependency
- ac_java_classpath="$ac_java_classpath:$PACKAGE_JAR_FILE"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- if test "" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jaf used by Scilab Gui - JavaBeans Activation Framework (looking for package javax.activation.MimetypesFileTypeMap)" >&5
-$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jaf used by Scilab Gui - JavaBeans Activation Framework (looking for package javax.activation.MimetypesFileTypeMap)" >&2;}
- else
- as_fn_error $? "Could not find or use the Java package/jar jaf used by Scilab Gui - JavaBeans Activation Framework (looking for package javax.activation.MimetypesFileTypeMap)" "$LINENO" 5
- fi
- fi
- if test -f conftestSharedChecker.java.output; then
- rm conftestSharedChecker.java.output
- fi
-
- JAF=$PACKAGE_JAR_FILE
-
-
################ Mandatory for graphic_export features #####
# XML to PDF/other Translator
Index: scilab-6.0.1/configure.ac
===================================================================
--- scilab-6.0.1.orig/configure.ac
+++ scilab-6.0.1/configure.ac
@@ -1038,9 +1038,9 @@ interface for JOGL2 - or libGL (OpenGL l
AC_SUBST(JEUCLID_CORE)
# JAF required for xmlto* functions
- AC_JAVA_CHECK_JAR([jaf],[javax.activation.MimetypesFileTypeMap],[JAF : JavaBeans Activation Framework])
- JAF=$PACKAGE_JAR_FILE
- AC_SUBST(JAF)
+ #AC_JAVA_CHECK_JAR([jaf],[javax.activation.MimetypesFileTypeMap],[JAF : JavaBeans Activation Framework])
+ #JAF=$PACKAGE_JAR_FILE
+ #AC_SUBST(JAF)
################ Mandatory for graphic_export features #####
# XML to PDF/other Translator