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=5f96a92599d056....
Change: +ExcludeArch: aarch64 s390x armv7hl
Thanks.
Full change: ============
commit 5f96a92599d05620cc81ad9e6ef4686c0fe437c8 Author: Clément DAVID clement.david@esi-group.com Date: Tue Feb 27 09:51:24 2018 +0100
ExcludeArch with buggy Java support
diff --git a/scilab.spec b/scilab.spec index 752d691..8d9fe7e 100644 --- a/scilab.spec +++ b/scilab.spec @@ -34,6 +34,7 @@ Name: scilab Version: 6.0.0 Release: %{pkg_release} Summary: Scientific software package for numerical computations +ExcludeArch: aarch64 s390x armv7hl
Group: Applications/Engineering License: CeCILL
commit aee154abb3cd62717a0fac5845576c584a23578a Author: Clément DAVID clement.david@esi-group.com Date: Mon Feb 26 23:46:56 2018 +0100
Fix gfortran 8 errors
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 7dd606d..0bc82e3 100644 --- a/scilab-0004-Fix-build-with-ocaml-4.0.4.patch +++ b/scilab-0004-Fix-build-with-ocaml-4.0.4.patch @@ -11,114 +11,16 @@ 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/Makefile.in +Index: scilab-6.0.0/modules/scicos/src/modelica_compiler/optimization.ml =================================================================== ---- scilab-6.0.0.orig/modules/scicos/Makefile.in -+++ scilab-6.0.0/modules/scicos/Makefile.in -@@ -490,7 +490,7 @@ libscisundials_la_LINK = $(LIBTOOL) $(AM - @OCAML_TRUE@@XCOS_TRUE@ modelicat$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - am__XML2Modelica_SOURCES_DIST = $(srcdir)/src/xml2modelica/xMLTree.ml \ -- $(srcdir)/src/xml2modelica/linenum.mll \ -+ $(srcdir)/src/modelica_compiler/linenum.mll \ - $(srcdir)/src/xml2modelica/stringParser.ml \ - $(srcdir)/src/xml2modelica/stringLexer.ml \ - $(srcdir)/src/xml2modelica/xMLParser.ml \ -@@ -1266,7 +1266,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR - ### XML2Modelica - @OCAML_TRUE@@XCOS_TRUE@XML2Modelica_SOURCES = \ - @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/xMLTree.ml \ --@OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/linenum.mll \ -+@OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/modelica_compiler/linenum.mll \ - @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/stringParser.ml \ - @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/stringLexer.ml \ - @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/xMLParser.ml \ -@@ -3826,10 +3826,10 @@ distclean-local: - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.ml - @OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmx ./src/xml2modelica/xMLTree.o \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/xMLTree.cmi : ./src/xml2modelica/xMLTree.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/linenum.cmo ./src/xml2modelica/linenum.cmi : \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/linenum.ml --@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/linenum.cmx ./src/xml2modelica/linenum.o \ --@OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/linenum.cmi : ./src/xml2modelica/linenum.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmo ./src/modelica_compiler/linenum.cmi : \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.ml -+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/linenum.o \ -+@OCAML_TRUE@@XCOS_TRUE@ ./src/modelica_compiler/linenum.cmi : ./src/modelica_compiler/linenum.ml - @OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringParser.cmi : \ - @OCAML_TRUE@@XCOS_TRUE@ ./src/xml2modelica/stringParser.ml - @OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringParser.o \ -Index: scilab-6.0.0/modules/scicos/Makefile.modelica.am -=================================================================== ---- scilab-6.0.0.orig/modules/scicos/Makefile.modelica.am -+++ scilab-6.0.0/modules/scicos/Makefile.modelica.am -@@ -29,7 +29,7 @@ OCAMLLIBS=nums.cma - - XML2Modelica_SOURCES = \ - $(srcdir)/src/xml2modelica/xMLTree.ml \ -- $(srcdir)/src/xml2modelica/linenum.mll \ -+ $(srcdir)/src/modelica_compiler/linenum.mll \ - $(srcdir)/src/xml2modelica/stringParser.ml \ - $(srcdir)/src/xml2modelica/stringLexer.ml \ - $(srcdir)/src/xml2modelica/xMLParser.ml \ -Index: scilab-6.0.0/modules/scicos/src/xml2modelica/linenum.mll -=================================================================== ---- scilab-6.0.0.orig/modules/scicos/src/xml2modelica/linenum.mll -+++ /dev/null -@@ -1,56 +0,0 @@ --(* -- * Translator from Modelica 2.x to flat Modelica -- * -- * Copyright (C) 2005 - 2007 Imagine S.A. -- * For more information or commercial use please contact us at www.amesim.com -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License -- * as published by the Free Software Foundation; either version 2 -- * of the License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -- * -- *) -- --{ -- --(** Convert {! Parser.location } to line and column numbers. *) -- --let linenum = ref 0 --let linebeg = ref 0 -- --} -- --rule skip_line = parse -- | [^ '\n' '\r']* ('\n' | '\r' | "\r\n") -- { incr linenum; -- linebeg := Lexing.lexeme_start lexbuf; -- Lexing.lexeme_end lexbuf } -- | [^ '\n' '\r']* eof -- { incr linenum; -- linebeg := Lexing.lexeme_start lexbuf; -- raise End_of_file } -- --{ -- --let for_position file loc = -- let ic = open_in_bin file in -- let lb = Lexing.from_channel ic in -- linenum := 1; -- linebeg := 0; -- begin try -- while skip_line lb <= loc do () done -- with End_of_file -> () -- end; -- close_in ic; -- (!linenum - 1, !linebeg) -- --} +--- scilab-6.0.0.orig/modules/scicos/src/modelica_compiler/optimization.ml ++++ scilab-6.0.0/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 + let sm = string_of_float m in +- let s = String.make 16 '0' in ++ let s = Bytes.make 16 '0' in + String.blit sm 2 s 0 (String.length sm - 2); + let e' = Num.power_num (Num.Int 2) (Num.num_of_int e) in + Num.div_num (Num.mult_num (Num.num_of_string s) e') scaling_factor diff --git a/scilab-0007-fix-gfortran-errors.patch b/scilab-0007-fix-gfortran-errors.patch new file mode 100644 index 0000000..63c245c --- /dev/null +++ b/scilab-0007-fix-gfortran-errors.patch @@ -0,0 +1,13 @@ +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 f8af93c..752d691 100644 --- a/scilab.spec +++ b/scilab.spec @@ -59,11 +59,13 @@ Patch2: %{name}-0002-jogl-2.3.2.patch # Add support for ppc64le Patch3: %{name}-0003-fix-ppc64le-build.patch # Fix the OCaML build -Patch4: %{name}-0004-Fix-build-with-ocaml-4.0.4.patch +# Patch4: %{name}-0004-Fix-build-with-ocaml-4.0.4.patch # Fix Apache Lucene 6 build Patch5: %{name}-0005-fix-build-with-modern-lucene.patch # Fix Apache Batik runtime detection Patch6: %{name}-0006-update-runtime-batik-detection.patch +# Fix GFortran errors +Patch7: %{name}-0007-fix-gfortran-errors.patch
# Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" @@ -138,7 +140,8 @@ Requires: tcl Requires: tk
# Modelica -BuildRequires: ocaml +#BuildRequires: ocaml +#BuildRequires: ocaml-num-devel
# Documentation BuildRequires: saxon @@ -238,9 +241,10 @@ This package provide test files for Scilab. %patch1 -p1 -b .pkgcon %patch2 -p1 -b .jogl %patch3 -p1 -b .ppc64le -%patch4 -p1 -b .ocaml +#%patch4 -p1 -b .ocaml %patch5 -p1 -b .lucene %patch6 -p1 -b .batik +%patch7 -p1 -b .gfortran
# Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml @@ -260,9 +264,10 @@ mv COPYING.utf8 COPYING # it is a windows specific format %configure \ --disable-static-system-lib \ - --without-emf + --without-emf \ + --without-modelica
-make -C modules/scicos modelicac modelicat XML2Modelica +#make -C modules/scicos modelicac modelicat XML2Modelica make %{?_smp_mflags} make %{?_smp_mflags} doc SCIVERBOSE=1
diff --git a/series b/series index 97dde61..3cb9768 100644 --- a/series +++ b/series @@ -4,3 +4,4 @@ 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
arch-excludes@lists.fedoraproject.org