The package rpms/scilab.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/scilab.git/commit/?id=6beb0db6c3f....
Change:
+ExcludeArch: s390x armv7hl i686
Thanks.
Full change:
============
commit b3efff237be3cf78f4a616d04ff2bacbaaaf7bd8
Author: Clment DAVID <clement.david(a)esi-group.com>
Date: Mon Feb 25 22:03:12 2019 +0100
Update to 6.0.2
diff --git a/scilab-0001-Use-pkcon-to-install-doc-package.patch
b/scilab-0001-Use-pkcon-to-install-doc-package.patch
index 8c149a9..d75554a 100644
--- a/scilab-0001-Use-pkcon-to-install-doc-package.patch
+++ b/scilab-0001-Use-pkcon-to-install-doc-package.patch
@@ -1,8 +1,8 @@
-Index: scilab-6.0.0/modules/helptools/macros/help.sci
+Index: scilab-6.0.2/modules/helptools/macros/help.sci
===================================================================
---- scilab-6.0.0.orig/modules/helptools/macros/help.sci
-+++ scilab-6.0.0/modules/helptools/macros/help.sci
-@@ -56,7 +56,8 @@ function help(varargin)
+--- scilab-6.0.2.orig/modules/helptools/macros/help.sci
++++ scilab-6.0.2/modules/helptools/macros/help.sci
+@@ -58,7 +58,8 @@ function help(varargin)
error(msprintf(gettext("%s: The help browser is disabled in %s
mode.\n"), "help", getscilabmode()));
end
else
diff --git a/scilab-0002-jogl-2.3.2.patch b/scilab-0002-jogl-2.3.2.patch
index dbc44f6..f4b8b5e 100644
--- a/scilab-0002-jogl-2.3.2.patch
+++ b/scilab-0002-jogl-2.3.2.patch
@@ -6,11 +6,11 @@ Date: Wed Dec 2 15:09:07 2015 +0100
Change-Id: Ic188bb392d1dd8441d1a4132004f77b63a3353df
-Index: scilab-6.0.0/configure
+Index: scilab-6.0.2/configure
===================================================================
---- scilab-6.0.0.orig/configure
-+++ scilab-6.0.0/configure
-@@ -15276,7 +15276,7 @@ EOF
+--- scilab-6.0.2.orig/configure
++++ scilab-6.0.2/configure
+@@ -15377,7 +15377,7 @@ EOF
CLASSPATH=$ac_java_classpath
export CLASSPATH
@@ -19,7 +19,7 @@ Index: scilab-6.0.0/configure
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
-@@ -15288,10 +15288,10 @@ $as_echo "$PACKAGE_JAR_FILE" >&6; }
+@@ -15389,10 +15389,10 @@ $as_echo "$PACKAGE_JAR_FILE" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if test "" = "yes"; then
@@ -33,7 +33,7 @@ Index: scilab-6.0.0/configure
fi
fi
if test -f conftestSharedChecker.java.output; then
-@@ -15302,8 +15302,8 @@ $as_echo "$as_me: WARNING: Could not fin
+@@ -15403,8 +15403,8 @@ $as_echo "$as_me: WARNING: Could not fin
@@ -44,7 +44,7 @@ Index: scilab-6.0.0/configure
export JARFILE=$JOGL2;
if test "x" == "x"; then
-@@ -15316,7 +15316,7 @@ import java.util.jar.JarFile;
+@@ -15417,7 +15417,7 @@ import java.util.jar.JarFile;
public class conftest {
public static void main(String[] argv) {
@@ -53,7 +53,7 @@ Index: scilab-6.0.0/configure
try {
String version = new
JarFile(System.getenv("JARFILE")).getManifest().getMainAttributes().getValue("Specification-Version");
System.out.println(version);
-@@ -15369,7 +15369,7 @@ EOF
+@@ -15470,7 +15470,7 @@ EOF
STDOUT=`cat conftest.java.output`
fi
echo "configure: CLASSPATH was $CLASSPATH" >&5
@@ -62,7 +62,7 @@ Index: scilab-6.0.0/configure
fi
fi
if test -f conftest.java.output; then
-@@ -15379,7 +15379,7 @@ EOF
+@@ -15480,7 +15480,7 @@ EOF
echo "configure: failed program was:" >&5
cat conftest.java >&5
echo "configure: CLASSPATH was $CLASSPATH" >&5
@@ -71,7 +71,7 @@ Index: scilab-6.0.0/configure
fi
else
-@@ -15393,7 +15393,7 @@ import java.util.jar.JarFile;
+@@ -15494,7 +15494,7 @@ import java.util.jar.JarFile;
public class conftest {
public static void main(String[] argv) {
@@ -80,7 +80,7 @@ Index: scilab-6.0.0/configure
try {
String version = new
JarFile(System.getenv("JARFILE")).getManifest().getMainAttributes().getValue("Specification-Version");
System.out.println("Specification-Version" + ": " +
version);
-@@ -15763,7 +15763,7 @@ EOF
+@@ -15864,7 +15864,7 @@ EOF
CLASSPATH=$ac_java_classpath
export CLASSPATH
@@ -89,7 +89,7 @@ Index: scilab-6.0.0/configure
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
-@@ -15775,10 +15775,10 @@ $as_echo "$PACKAGE_JAR_FILE" >&6; }
+@@ -15876,10 +15876,10 @@ $as_echo "$PACKAGE_JAR_FILE" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if test "" = "yes"; then
@@ -103,11 +103,11 @@ Index: scilab-6.0.0/configure
fi
fi
if test -f conftestSharedChecker.java.output; then
-Index: scilab-6.0.0/configure.ac
+Index: scilab-6.0.2/configure.ac
===================================================================
---- scilab-6.0.0.orig/configure.ac
-+++ scilab-6.0.0/configure.ac
-@@ -940,11 +940,11 @@ if test "$with_javasci" != no -o "$with_
+--- scilab-6.0.2.orig/configure.ac
++++ scilab-6.0.2/configure.ac
+@@ -942,11 +942,11 @@ if test "$with_javasci" != no -o "$with_
AC_SUBST(SKINLF)
# JOGL 2
@@ -121,7 +121,7 @@ Index: scilab-6.0.0/configure.ac
if test "$MACOSX" = 1; then
echo "Check of the presence of libjogl.jnilib and
libjogl_awt.jnilib disabled under Mac OS X"
-@@ -971,7 +971,7 @@ interface for JOGL2 - or libGL (OpenGL l
+@@ -973,7 +973,7 @@ interface for JOGL2 - or libGL (OpenGL l
fi
# JoGL Native <=> Java connector
@@ -130,11 +130,11 @@ Index: scilab-6.0.0/configure.ac
GLUEGEN2_RT=$PACKAGE_JAR_FILE
AC_SUBST(GLUEGEN2_RT)
-Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
+Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
===================================================================
---- scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
-+++ scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
-@@ -87,10 +87,10 @@ import java.util.Map;
+--- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
+@@ -88,10 +88,10 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -149,10 +149,10 @@ Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/SwingView.java
import javax.swing.JComponent;
import javax.swing.JSeparator;
import javax.swing.SwingUtilities;
-Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
+Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
===================================================================
----
scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
-+++ scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
+---
scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java
@@ -23,7 +23,7 @@ import java.awt.Cursor;
import java.awt.Font;
import java.awt.image.BufferedImage;
@@ -162,10 +162,10 @@ Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBri
import org.scilab.modules.gui.canvas.Canvas;
import org.scilab.modules.gui.canvas.ScilabCanvas;
-Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
+Index:
scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
===================================================================
----
scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
-+++
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
+---
scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
++++
scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java
@@ -35,8 +35,8 @@ import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.image.BufferedImage;
@@ -177,10 +177,10 @@ Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/Sw
import javax.swing.JPanel;
import org.scilab.forge.scirenderer.Canvas;
-Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
+Index:
scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
===================================================================
----
scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
-+++
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
+---
scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
++++
scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java
@@ -22,12 +22,12 @@ import java.awt.HeadlessException;
import java.util.Calendar;
import java.util.StringTokenizer;
@@ -200,10 +200,10 @@ Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/Sw
import org.scilab.modules.action_binding.InterpreterManagement;
import org.scilab.modules.commons.OS;
-Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
+Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
===================================================================
---- scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
-+++ scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
+--- scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.java
@@ -17,7 +17,7 @@ package org.scilab.modules.gui.canvas;
import java.awt.image.BufferedImage;
@@ -213,10 +213,10 @@ Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/Canvas.ja
import org.scilab.modules.gui.dockable.Dockable;
-Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
+Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
===================================================================
----
scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
-+++ scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
+---
scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java
@@ -19,7 +19,7 @@ package org.scilab.modules.gui.canvas;
import java.awt.image.BufferedImage;
@@ -226,10 +226,10 @@ Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCan
import org.scilab.modules.gui.bridge.ScilabBridge;
import org.scilab.modules.gui.dockable.ScilabDockable;
-Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
+Index:
scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
===================================================================
----
scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
-+++
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
+---
scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
++++
scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java
@@ -17,7 +17,7 @@ package org.scilab.modules.gui.canvas;
import java.awt.image.BufferedImage;
@@ -239,10 +239,10 @@ Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCan
import org.scilab.modules.gui.bridge.canvas.SwingScilabCanvas;
import org.scilab.modules.gui.utils.Position;
-Index: scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
+Index: scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
===================================================================
----
scilab-6.0.0.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
-+++ scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
+---
scilab-6.0.2.orig/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
++++ scilab-6.0.2/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java
@@ -18,7 +18,7 @@ package org.scilab.modules.gui.canvas;
import org.scilab.modules.gui.utils.Position;
import org.scilab.modules.gui.utils.Size;
@@ -252,10 +252,10 @@ Index:
scilab-6.0.0/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCan
import java.awt.image.BufferedImage;
/**
-Index: scilab-6.0.0/modules/scirenderer/scirenderer-libs.properties
+Index: scilab-6.0.2/modules/scirenderer/scirenderer-libs.properties
===================================================================
---- scilab-6.0.0.orig/modules/scirenderer/scirenderer-libs.properties
-+++ scilab-6.0.0/modules/scirenderer/scirenderer-libs.properties
+--- scilab-6.0.2.orig/modules/scirenderer/scirenderer-libs.properties
++++ scilab-6.0.2/modules/scirenderer/scirenderer-libs.properties
@@ -1,7 +1,7 @@
; Define all libs needed by scirenderer
@@ -266,10 +266,10 @@ Index: scilab-6.0.0/modules/scirenderer/scirenderer-libs.properties
+gluegen2.jar = /usr/lib/java/gluegen2-rt.jar
jlatexmath.jar = /usr/share/java/jlatexmath.jar
jni.path = /usr/lib/jni
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
@@ -19,16 +19,16 @@ import java.awt.image.BufferedImage;
import java.lang.reflect.InvocationTargetException;
import java.util.concurrent.Semaphore;
@@ -297,10 +297,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
import javax.swing.SwingUtilities;
import org.scilab.forge.scirenderer.Canvas;
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvasFactory.java
@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp
import org.scilab.forge.scirenderer.Canvas;
@@ -310,10 +310,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @author Pierre Lando
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java
@@ -14,7 +14,7 @@
package org.scilab.forge.scirenderer.implementation.jogl;
@@ -323,10 +323,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* This class store current OpenGl context capacity.
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLDrawingTools.java
@@ -34,7 +34,7 @@ import org.scilab.forge.scirenderer.tran
import org.scilab.forge.scirenderer.tranformations.TransformationManagerListener;
import org.scilab.forge.scirenderer.tranformations.Vector3d;
@@ -336,10 +336,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
*
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLParameters.java
@@ -14,8 +14,8 @@
package org.scilab.forge.scirenderer.implementation.jogl;
@@ -351,10 +351,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @author Pierre Lando
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLBuffersManager.java
@@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.buff
import org.scilab.forge.scirenderer.buffers.ElementsBuffer;
import org.scilab.forge.scirenderer.buffers.IndicesBuffer;
@@ -364,10 +364,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLDataBuffer.java
@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp
import org.scilab.forge.scirenderer.buffers.DataBuffer;
@@ -377,10 +377,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
import java.nio.Buffer;
/**
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLElementsBuffer.java
@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp
import org.scilab.forge.scirenderer.buffers.ElementsBuffer;
@@ -390,10 +390,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
import java.nio.Buffer;
import java.nio.FloatBuffer;
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/buffers/JoGLIndicesBuffer.java
@@ -16,7 +16,7 @@ package org.scilab.forge.scirenderer.imp
import org.scilab.forge.scirenderer.buffers.IndicesBuffer;
@@ -403,10 +403,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
import java.nio.Buffer;
import java.nio.IntBuffer;
import java.util.Collection;
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingManager.java
@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.clip
import org.scilab.forge.scirenderer.clipping.ClippingPlane;
import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools;
@@ -416,10 +416,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @author Pierre Lando
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/clipping/JoGLClippingPlane.java
@@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.tran
import org.scilab.forge.scirenderer.tranformations.TransformationFactory;
import org.scilab.forge.scirenderer.tranformations.Vector4d;
@@ -429,10 +429,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @author Pierre Lando
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/drawer/JoGLShapeDrawer.java
@@ -26,7 +26,7 @@ import org.scilab.forge.scirenderer.text
import org.scilab.forge.scirenderer.lightning.LightManager;
import org.scilab.forge.scirenderer.shapes.appearance.Material;
@@ -442,10 +442,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
import java.nio.FloatBuffer;
import java.nio.IntBuffer;
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLight.java
@@ -14,7 +14,7 @@
package org.scilab.forge.scirenderer.implementation.jogl.lightning;
@@ -455,10 +455,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
import org.scilab.forge.scirenderer.implementation.jogl.utils.GLShortCuts;
import org.scilab.forge.scirenderer.lightning.Light;
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/lightning/JoGLLightManager.java
@@ -20,7 +20,7 @@ import org.scilab.forge.scirenderer.ligh
import org.scilab.forge.scirenderer.lightning.LightManager;
import org.scilab.forge.scirenderer.shapes.appearance.Material;
@@ -468,10 +468,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* JoGL implementation of {@link LightManager}
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/GLPickingManager.java
@@ -14,7 +14,7 @@
package org.scilab.forge.scirenderer.implementation.jogl.picking;
@@ -481,10 +481,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @author Pierre Lando
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/picking/JoGLPickingTools.java
@@ -19,7 +19,7 @@ import org.scilab.forge.scirenderer.impl
import org.scilab.forge.scirenderer.picking.PickingTools;
import org.scilab.forge.scirenderer.tranformations.Vector3d;
@@ -494,10 +494,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
import java.awt.Point;
import java.nio.FloatBuffer;
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRenderer.java
@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.Draw
import org.scilab.forge.scirenderer.implementation.jogl.JoGLDrawingTools;
import org.scilab.forge.scirenderer.renderer.Renderer;
@@ -507,10 +507,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
/**
* @author Pierre Lando
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/renderer/JoGLRendererManager.java
@@ -18,7 +18,7 @@ import org.scilab.forge.scirenderer.impl
import org.scilab.forge.scirenderer.renderer.Renderer;
import org.scilab.forge.scirenderer.renderer.RendererManager;
@@ -520,10 +520,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
import java.util.HashSet;
import java.util.Set;
import java.util.Stack;
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java
@@ -32,11 +32,11 @@ import org.scilab.forge.scirenderer.tran
import org.scilab.forge.scirenderer.tranformations.Vector3d;
@@ -541,10 +541,10 @@ Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/impleme
import java.awt.Dimension;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
-Index:
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
+Index:
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
===================================================================
----
scilab-6.0.0.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
-+++
scilab-6.0.0/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
+---
scilab-6.0.2.orig/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
++++
scilab-6.0.2/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/utils/GLShortCuts.java
@@ -17,7 +17,7 @@ package org.scilab.forge.scirenderer.imp
import org.scilab.forge.scirenderer.shapes.appearance.Appearance;
import org.scilab.forge.scirenderer.shapes.appearance.Color;
diff --git a/scilab-0003-fix-ppc64le-build.patch b/scilab-0003-fix-ppc64le-build.patch
index ff428ba..339186a 100644
--- a/scilab-0003-fix-ppc64le-build.patch
+++ b/scilab-0003-fix-ppc64le-build.patch
@@ -1,8 +1,8 @@
-Index: scilab-6.0.0/configure
+Index: scilab-6.0.2/configure
===================================================================
---- scilab-6.0.0.orig/configure
-+++ scilab-6.0.0/configure
-@@ -12320,7 +12320,7 @@ $as_echo "$ac_cv_java_jvm_jni_working" >
+--- scilab-6.0.2.orig/configure
++++ scilab-6.0.2/configure
+@@ -12391,7 +12391,7 @@ $as_echo "$ac_cv_java_jvm_jni_working" >
powerpc)
machine=ppc
;;
@@ -11,21 +11,11 @@ Index: scilab-6.0.0/configure
machine=ppc64
;;
armv*)
-Index: scilab-6.0.0/bin/scilab
+Index: scilab-6.0.2/bin/scilab
===================================================================
---- scilab-6.0.0.orig/bin/scilab
-+++ scilab-6.0.0/bin/scilab
-@@ -538,9 +538,6 @@ detect_java_vm() {
- "ppc"|"powerpc")
- proc="ppc"
- ;;
-- "ppc64"|"ppc64el")
-- proc="ppc64"
-- ;;
- "s390")
- proc="s390"
- ;;
-@@ -550,11 +547,15 @@ detect_java_vm() {
+--- scilab-6.0.2.orig/bin/scilab
++++ scilab-6.0.2/bin/scilab
+@@ -554,11 +554,15 @@ detect_java_vm() {
armv*)
proc="arm"
;;
@@ -42,7 +32,7 @@ Index: scilab-6.0.0/bin/scilab
;;
esac
;;
-@@ -609,7 +610,7 @@ detect_java_vm() {
+@@ -613,7 +617,7 @@ detect_java_vm() {
CLASSPATH="${CLASSPATH:+:$CLASSPATH}$SCI/modules/core/jar/org.scilab.modules.core.jar"
# @TODO This is the default path of the official sun JVM.
# It is different for other implementation of the JVM....
diff --git a/scilab-0004-Fix-build-with-ocaml-4.0.4.patch
b/scilab-0004-Fix-build-with-ocaml-4.0.4.patch
index 0bc82e3..2b9beed 100644
--- a/scilab-0004-Fix-build-with-ocaml-4.0.4.patch
+++ b/scilab-0004-Fix-build-with-ocaml-4.0.4.patch
@@ -11,10 +11,10 @@ Change-Id: I962fe026f1c44f7f76435db0b4838b0d936994c8
4 files changed, 11 insertions(+), 67 deletions(-)
delete mode 100644 scilab/modules/scicos/src/xml2modelica/linenum.mll
-Index: scilab-6.0.0/modules/scicos/src/modelica_compiler/optimization.ml
+Index: scilab-6.0.2/modules/scicos/src/modelica_compiler/optimization.ml
===================================================================
---- scilab-6.0.0.orig/modules/scicos/src/modelica_compiler/optimization.ml
-+++ scilab-6.0.0/modules/scicos/src/modelica_compiler/optimization.ml
+--- scilab-6.0.2.orig/modules/scicos/src/modelica_compiler/optimization.ml
++++ scilab-6.0.2/modules/scicos/src/modelica_compiler/optimization.ml
@@ -162,7 +162,7 @@ let num_of_float f =
let num_of_positive_float f =
let m, e = frexp f in
diff --git a/scilab-0005-fix-build-with-modern-lucene.patch
b/scilab-0005-fix-build-with-modern-lucene.patch
index 6f324f3..ddde3e5 100644
--- a/scilab-0005-fix-build-with-modern-lucene.patch
+++ b/scilab-0005-fix-build-with-modern-lucene.patch
@@ -1,7 +1,7 @@
-Index:
scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java
+Index:
scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java
===================================================================
----
scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java
-+++
scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java
+---
scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java
++++
scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java
@@ -162,7 +162,6 @@ public final class PaletteIndexer {
// add the block name
@@ -18,10 +18,10 @@ Index:
scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/Palett
doc.add(refpurpose);
}
-Index:
scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
+Index:
scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
===================================================================
----
scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
-+++
scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
+---
scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
++++
scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
@@ -57,7 +57,6 @@ public final class PaletteSearcher {
StandardQueryParser queryParserHelper = new StandardQueryParser();
diff --git a/scilab-0007-fix-gfortran-errors.patch
b/scilab-0007-fix-gfortran-errors.patch
deleted file mode 100644
index 63c245c..0000000
--- a/scilab-0007-fix-gfortran-errors.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: scilab-6.0.0/modules/differential_equations/src/fortran/twodq.f
-===================================================================
---- scilab-6.0.0.orig/modules/differential_equations/src/fortran/twodq.f
-+++ scilab-6.0.0/modules/differential_equations/src/fortran/twodq.f
-@@ -900,7 +900,7 @@ C
- END
-
- subroutine tridv(node,node1,node2,coef,rank)
-- double precision node(10),node1(10),node2(10),coef
-+ double precision node(9),node1(9),node2(9),coef
- integer rank
- double precision s(3),coef1,temp
- integer t(3)
diff --git a/scilab.spec b/scilab.spec
index f7a2496..ebaf499 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,7 +1,7 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 3
+%global baserelease 1
# On a released (stable or beta) version set it to 1
%global is_release 1
@@ -31,7 +31,7 @@
%endif
Name: scilab
-Version: 6.0.1
+Version: 6.0.2
Release: %{pkg_release}
Summary: Scientific software package for numerical computations
ExcludeArch: s390x armv7hl i686
@@ -63,7 +63,7 @@ Patch3: %{name}-0003-fix-ppc64le-build.patch
# Fix Lucene API compat
Patch5: %{name}-0005-fix-build-with-modern-lucene.patch
# Fix GFortran errors
-Patch7: %{name}-0007-fix-gfortran-errors.patch
+#Patch7: %{name}-0007-fix-gfortran-errors.patch
# Dependencies are extracted from :
# "http://wiki.scilab.org/Dependencies of Scilab 5.X"
@@ -237,7 +237,7 @@ This package provide test files for Scilab.
%patch3 -p1 -b .ppc64le
#%patch4 -p1 -b .ocaml
%patch5 -p1 -b .lucene
-%patch7 -p1 -b .gfortran
+#%patch7 -p1 -b .gfortran
# Fix Class-Path in manifest
sed -i '/name="Class-Path"/d' build.incl.xml
@@ -334,6 +334,9 @@ make check-TESTS || true
%{_datadir}/%{name}/modules/*/tests
%changelog
+* Mon Feb 25 2019 Clment David <c.david86(a)gmail.com> - 6.0.2-1
+- Update to 6.0.2
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.1-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 000e067..699c59a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scilab-6.0.1-src.tar.gz) =
4af806d4ceb50cf7273c3a223bf00ef4459380d9aed2e76af6f0dc6176c130c824eecd487f0f5d9cad3e1d76cc625f190f18f6005562fa0fa99c6a81e6865e2a
+SHA512 (scilab-6.0.2-src.tar.gz) =
194fbf02e83436e5be8949fadf67e7b9b739eaa02d876b01505634d59b2d02adbf2c48a50bc2fe61c25956cae6aea4f832f429506dcab26d4e110d1bcd9ddfef
commit c03dd70c15cb205ffb06ac339646fb04e6eb5649
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 2 14:55:52 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/scilab.spec b/scilab.spec
index 8b362d6..f7a2496 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,7 +1,7 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 2
+%global baserelease 3
# On a released (stable or beta) version set it to 1
%global is_release 1
@@ -334,6 +334,9 @@ make check-TESTS || true
%{_datadir}/%{name}/modules/*/tests
%changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.1-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 8a361b97945cefc4e03604778c047700f560cc86
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:18:25 2019 +0100
Remove obsolete Group tag
References:
https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/scilab.spec b/scilab.spec
index 84ca6da..8b362d6 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -36,7 +36,6 @@ Release: %{pkg_release}
Summary: Scientific software package for numerical computations
ExcludeArch: s390x armv7hl i686
-Group: Applications/Engineering
License: CeCILL
URL:
http://www.scilab.org/
%if %{is_release}
@@ -172,7 +171,6 @@ language allowing access to advanced data structures, 2-D and 3-D
graphical
functions.
%package devel
-Group: Applications/Engineering
License: CeCILL
Summary: Scientific software package for numerical computations (include files)
@@ -189,7 +187,6 @@ functions.
This package provide include files for Scilab.
%package doc
-Group: Documentation
License: CeCILL
Summary: Scientific software package (documentation files)
@@ -207,7 +204,6 @@ functions.
This package provide documentation files for Scilab.
%package tests
-Group: Applications/Engineering
License: CeCILL
Summary: Provides test files for Scilab
commit 6beb0db6c3f258dd9e2282dd6a61104a86e06059
Author: Clment DAVID <clement.david(a)esi-group.com>
Date: Fri Jul 27 13:55:37 2018 +0200
Blacklist i686 ; whitelist aarch64
diff --git a/scilab.spec b/scilab.spec
index 90e659f..84ca6da 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -34,7 +34,7 @@ Name: scilab
Version: 6.0.1
Release: %{pkg_release}
Summary: Scientific software package for numerical computations
-ExcludeArch: aarch64 s390x armv7hl
+ExcludeArch: s390x armv7hl i686
Group: Applications/Engineering
License: CeCILL
commit 798eef630ec23e462fdd41d1a3c99890d298e8f4
Author: Clment DAVID <clement.david(a)esi-group.com>
Date: Fri Jul 27 10:04:18 2018 +0200
Fix #1606802 : FTBFS in Fedora rawhide
diff --git a/scilab-0005-fix-build-with-modern-lucene.patch
b/scilab-0005-fix-build-with-modern-lucene.patch
index a432a3b..6f324f3 100644
--- a/scilab-0005-fix-build-with-modern-lucene.patch
+++ b/scilab-0005-fix-build-with-modern-lucene.patch
@@ -1,13 +1,32 @@
-Index:
scilab-6.0.0/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
+Index:
scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java
===================================================================
----
scilab-6.0.0.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
-+++
scilab-6.0.0/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
-@@ -52,7 +52,7 @@ public final class PaletteSearcher {
- */
- public List<Document> search(String str) {
- List<Document> found = new ArrayList<>();
-- try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter(), true)) {
-+ try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter())) {
- IndexSearcher searcher = new IndexSearcher(reader);
+---
scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java
++++
scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java
+@@ -162,7 +162,6 @@ public final class PaletteIndexer {
+
+ // add the block name
+ Field refname = new TextField("refname", basename,
Field.Store.YES);
+- refname.setBoost(100f);
+ doc.add(refname);
+
+ // add the refpurpose
+@@ -176,7 +175,6 @@ public final class PaletteIndexer {
+ refpurpose = new TextField("refpurpose", "",
Field.Store.YES);
+ }
+
+- refpurpose.setBoost(10f);
+ doc.add(refpurpose);
+ }
+
+Index:
scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
+===================================================================
+---
scilab-6.0.1.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
++++
scilab-6.0.1/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java
+@@ -57,7 +57,6 @@ public final class PaletteSearcher {
StandardQueryParser queryParserHelper = new StandardQueryParser();
+ queryParserHelper.setAllowLeadingWildcard(true);
+- queryParserHelper.setLowercaseExpandedTerms(true);
+ queryParserHelper.setAnalyzer(mgr.getAnalyzer());
+ queryParserHelper.setMultiFields(new String[] {"refname",
"refpurpose", "content"});
+
diff --git a/scilab.spec b/scilab.spec
index 923ad26..90e659f 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -61,6 +61,8 @@ Patch2: %{name}-0002-jogl-2.3.2.patch
Patch3: %{name}-0003-fix-ppc64le-build.patch
# Fix the OCaML build
# Patch4: %{name}-0004-Fix-build-with-ocaml-4.0.4.patch
+# Fix Lucene API compat
+Patch5: %{name}-0005-fix-build-with-modern-lucene.patch
# Fix GFortran errors
Patch7: %{name}-0007-fix-gfortran-errors.patch
@@ -158,9 +160,6 @@ BuildRequires: matio-devel
BuildRequires: suitesparse-devel
BuildRequires: hdf5-devel
-# hdf5 does not bump soname but check at runtime
-Requires: hdf5 = %{_hdf5_version}
-
# Specific dependencies for packaging purpose
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -241,6 +240,7 @@ This package provide test files for Scilab.
%patch2 -p1 -b .jogl
%patch3 -p1 -b .ppc64le
#%patch4 -p1 -b .ocaml
+%patch5 -p1 -b .lucene
%patch7 -p1 -b .gfortran
# Fix Class-Path in manifest
diff --git a/series b/series
index 3cb9768..d258d5c 100644
--- a/series
+++ b/series
@@ -3,5 +3,4 @@ scilab-0002-jogl-2.3.2.patch
scilab-0003-fix-ppc64le-build.patch
scilab-0004-Fix-build-with-ocaml-4.0.4.patch
scilab-0005-fix-build-with-modern-lucene.patch
-scilab-0006-update-runtime-batik-detection.patch
scilab-0007-fix-gfortran-errors.patch
commit b479bdc3eadeea93d3e0f1a8e4a828d1362e91bc
Author: Clment DAVID <clement.david(a)esi-group.com>
Date: Sun Jul 15 21:18:12 2018 +0200
Add BuildRequire: gcc gcc-c++
diff --git a/scilab.spec b/scilab.spec
index d949f62..923ad26 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -68,6 +68,8 @@ Patch7: %{name}-0007-fix-gfortran-errors.patch
# "http://wiki.scilab.org/Dependencies of Scilab 5.X"
# Mandatory
+BuildRequires: gcc
+BuildRequires: gcc-c++
BuildRequires: gcc-gfortran
## for dynamic link features
commit 54d947b4919eea647c876dc31fc38131e56dbf7f
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 05:49:10 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/scilab.spec b/scilab.spec
index d949831..d949f62 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,7 +1,7 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 1
+%global baserelease 2
# On a released (stable or beta) version set it to 1
%global is_release 1
@@ -336,6 +336,9 @@ make check-TESTS || true
%{_datadir}/%{name}/modules/*/tests
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 6.0.1-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Wed Feb 28 2018 Clment David <c.david86(a)gmail.com> - 6.0.1-1
- Update to 6.0.1
commit 73ae5aac68ccdeba0393fefdcc73f0ccb9a085d2
Author: Clment DAVID <clement.david(a)esi-group.com>
Date: Thu Mar 1 08:48:35 2018 +0100
Enforce LIBGL_ALWAYS_SOFTWARE while building
diff --git a/scilab.spec b/scilab.spec
index 4c51661..d949831 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -254,6 +254,9 @@ mv COPYING.utf8 COPYING
%build
+# enforce a specific GL implementation
+export LIBGL_ALWAYS_SOFTWARE=1
+
# disable-static-system-lib: do not static link with compiler libs
# without-emf: disabled because freehep-*.jar are not packaged in fedora and
# it is a windows specific format