[scilab] Update to 5.4.1

[Clément David]

commit b189c010577186a198c3d3cedd94bbd55a0a4d8f
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Thu Apr 4 08:55:26 2013 +0200

    Update to 5.4.1
    
    - disable matio 1.5

 scilab-0001-Port-to-matio-1.5.patch                | 6474 --------------------
 ...lab-0001-Use-pkcon-to-install-doc-package.patch |    0
 scilab-0003-fix-JoGL-configure-path.patch          |   78 -
 scilab.spec                                        |   35 +-
 4 files changed, 16 insertions(+), 6571 deletions(-)
---
diff --git a/scilab-0002-Use-pkcon-to-install-doc-package.patch b/scilab-0001-Use-pkcon-to-install-doc-package.patch
similarity index 100%
rename from scilab-0002-Use-pkcon-to-install-doc-package.patch
rename to scilab-0001-Use-pkcon-to-install-doc-package.patch
diff --git a/scilab.spec b/scilab.spec
index 98af1e7..0251bbd 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 4
+%global baserelease 1
 
 # On a prerelease version set this settings to the selected date and commit,
 # to switch to a released version set them to 0.
@@ -16,7 +16,7 @@
 %endif
 
 Name:           scilab
-Version:        5.4.0
+Version:        5.4.1
 Release:        %{pkg_release}
 Summary:        Scientific software package for numerical computations
 
@@ -29,14 +29,8 @@ Source0:        http://downloadarea.scilab.org/download/%(date -d%{prerelease_da
 Source0:        http://www.scilab.org/download/%{version}/scilab-%{version}-src.tar.gz
 %endif
 
-# backport matio 1.5 support, see http://codereview.scilab.org/#/c/6680/
-Patch1:         %{name}-0001-Port-to-matio-1.5.patch
-
 # Bug 767102 - help() should suggest scilab-doc
-Patch2:         %{name}-0002-Use-pkcon-to-install-doc-package.patch
-
-# Update to fedora JoGL2 packaging (upstream fixed that)
-Patch3:         %{name}-0003-fix-JoGL-configure-path.patch
+Patch1:         %{name}-0001-Use-pkcon-to-install-doc-package.patch
 
 # Dependencies are extracted from :
 # "http://wiki.scilab.org/Dependencies of Scilab 5.X"
@@ -64,17 +58,17 @@ BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
 BuildRequires:  ant
 
-BuildRequires:  flexdock >= 1.0
+BuildRequires:  flexdock
 BuildRequires:  scirenderer
 BuildRequires:  jogl2
 BuildRequires:  mesa-libGL-devel
 
-Requires:       flexdock >= 1.0
+Requires:       flexdock
 Requires:       scirenderer
 Requires:       jogl2
 
-BuildRequires:  jrosetta >= 1.0.4
-Requires:       jrosetta >= 1.0.4
+BuildRequires:  jrosetta
+Requires:       jrosetta
 
 BuildRequires:  apache-commons-logging
 BuildRequires:  javahelp2
@@ -114,7 +108,8 @@ BuildRequires:  liberation-sans-fonts
 # All optional dependencies are needed to provide a full-featured Scilab
 BuildRequires:  gettext-devel
 BuildRequires:  fftw-devel
-BuildRequires:  matio-devel
+# disabled until http://codereview.scilab.org/#/c/6680/ merge
+#BuildRequires:  matio-devel
 BuildRequires:  suitesparse-devel
 BuildRequires:  hdf5-devel
 
@@ -192,9 +187,7 @@ This package provide test files for Scilab.
 %setup -q
 %endif
 
-%patch1 -p2 -b .matio
-%patch2 -p2 -b .pkgcon
-%patch3 -p2 -b .jogl2
+%patch1 -p2 -b .pkgcon
 
 # Update saxon dependency
 # http://bugzilla.scilab.org/show_bug.cgi?id=8479
@@ -210,7 +203,7 @@ mv COPYING.utf8 COPYING
 
 
 %build
-%configure
+%configure --without-matio
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} doc
@@ -263,7 +256,7 @@ fi
 %{_bindir}/*
 %{_libdir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/icons/*/*/*/*.png
 %{_datadir}/mime/packages/%{name}.xml
 # part of scilab-devel
@@ -299,6 +292,10 @@ fi
 %{_datadir}/%{name}/modules/*/tests
 
 %changelog
+* Fri Mar 29 2013 Clément David <c.david86 at gmail.com> - 5.4.1-1
+- Update to 5.4.1
+- disable matio 1.5
+
 * Thu Feb 21 2013 Clément David <c.david86 at gmail.com> - 5.4.0-4
 - Remove the jdf5 dependency