[scilab: 1/2] Update to 5.4.0 nightly builds

Tue Apr 3 06:54:58 UTC 2012

commit ac0e4f581aa237bfe07abf5cfae390081f3beda5
Author: Clément DAVID <davidcl at fedoraproject.org>
Date:   Tue Apr 3 08:52:18 2012 +0200

    Update to 5.4.0 nightly builds

 .gitignore                                |    3 +
 0001-configure-upstream-patches.patch     |  426 -
 0003-Remove-Xcos-dependencies-check.patch |   90 -
 0004-fix-javadoc-encoding.patch           |   25 -
 0005-autoreconf.patch                     | 7308 ----------
 0006-fix-incorrect-fsf-adress.patch       |21353 -----------------------------
 0007-fix-zero-length.patch                |  606 -
 0008-fix-class-path-in-manifest.patch     |   32 -
 scilab.spec                               |  109 +-
 sources                                   |    2 +-
 10 files changed, 69 insertions(+), 29885 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 1775aa6..327d13f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+*~
+
 /scilab-5.3.3-src.tar.gz
+/scilab-master-1333395999-src.tar.gz
diff --git a/scilab.spec b/scilab.spec
index 391a558..8c71494 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,24 +1,33 @@
+# 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
+
+# On a prerelease version set this settings to the selected date and commit,
+# to switch to a released version set them to 0.
+%global prerelease_date 20120403
+%global prerelease_timestamp 1333395999
+
+# pkg_release is what we'll fill in for the rpm Release: field
+%if 0%{?prerelease_date}%{?prerelease_timestamp}
+    %define pkg_release 0.%{baserelease}.%{prerelease_date}snap%{?dist}
+%else
+    %define pkg_release %{baserelease}%{?dist}
+%endif
+
 Name:           scilab
-Version:        5.3.3
-Release:        9%{?dist}
+Version:        5.4.0
+Release:        %{pkg_release}
 Summary:        Scientific software package for numerical computations
 
 Group:          Applications/Engineering
 License:        CeCILL
 URL:            http://www.scilab.org/
+%if 0%{?prerelease_date}%{?prerelease_timestamp}
+Source0:        http://downloadarea.scilab.org/download/%(date -d%{prerelease_date} +%%Y-%%m-%%d)/scilab-master-%{prerelease_timestamp}-src.tar.gz
+%else
 Source0:        http://www.scilab.org/download/%{version}/scilab-%{version}-src.tar.gz
-
-Patch1:         0001-configure-upstream-patches.patch
-Patch2:         0002-Update-saxon-dependency-wrong-version.patch
-Patch3:         0003-Remove-Xcos-dependencies-check.patch
-Patch4:         0004-fix-javadoc-encoding.patch
-Patch5:         0005-autoreconf.patch
-# fix rpmlint errors
-Patch6:         0006-fix-incorrect-fsf-adress.patch
-Patch7:         0007-fix-zero-length.patch
-Patch8:         0008-fix-class-path-in-manifest.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
 
 # Dependencies are extracted from :
 # "http://wiki.scilab.org/Dependencies of Scilab 5.X"
@@ -99,7 +108,6 @@ BuildRequires:  suitesparse-devel
 BuildRequires:  hdf5-devel
 BuildRequires:  jhdf5
 
-Requires:       pvm
 # hdf5 does not bump soname but check at runtime
 Requires:       hdf5 = %{_hdf5_version}
 Requires:       jhdf5
@@ -169,36 +177,26 @@ functions.
 This package provide test files for Scilab.
 
 %prep
+%if 0%{?prerelease_date}%{?prerelease_timestamp}
+%setup -q -n scilab-master-%{prerelease_timestamp}
+%else
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-# fix incorrect-fsf-adress
-%patch6 -p1
-# fix zero-length
-%patch7 -p1
-# fix class-path-in-manifest
-%patch8 -p1
-# fix spurious-executable-perm
-chmod -x modules/scicos_blocks/src/c/*.c modules/scicos_blocks/includes/*.h
-# fix file-not-utf8
-while read file
-do
-    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
-    touch -r $file $file.new && \
-    mv $file.new $file
-done << EOF
-COPYING
-modules/scicos/macros/scicos_scicos/look_for_text.sci
-modules/scicos/macros/scicos_scicos/unhilite_modelica_block.sci
-EOF
+%endif
 
+# Update saxon dependency
+# http://bugzilla.scilab.org/show_bug.cgi?id=8479
+sed -i "s/com.icl.saxon.Loader/net.sf.saxon.Version/g" m4/docbook.m4 configure
+rm modules/helptools/src/java/org/scilab/modules/helptools/BuildDocObject.java
+
+# Fix Class-Path in manifest
+sed -i '/name="Class-Path"/d' build.incl.xml
+
+# Fix file-not-utf8
+iconv -f ISO_8859-1 -t UTF-8 COPYING >COPYING.utf8
+mv COPYING.utf8 COPYING
 
 %build
-%configure PVM_ROOT=%{_datadir}/pvm3
+%configure
 
 make %{?_smp_mflags}
 make %{?_smp_mflags} doc
@@ -227,14 +225,34 @@ s:%lang(en) ::
 s:%lang(C) ::
 /^$/d' >%{name}-doc.lang
 
+%check
+make check-TESTS
+
+# Update mimes and icons database
+%post
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README_Unix COPYING license.txt
 %{_bindir}/*
 %{_libdir}/%{name}
-%{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/*/*/*/*.png
+%{_datadir}/mime/packages/%{name}.xml
 # part of scilab-devel
 %exclude %{_datadir}/%{name}/contrib
 %exclude %{_datadir}/%{name}/tools
@@ -268,6 +286,9 @@ s:%lang(C) ::
 %{_datadir}/%{name}/modules/*/tests
 
 %changelog
+* Tue Apr 03 2012 Clément David <c.david86 at gmail.com> - 5.4.0-0.1.20120403snap
+- Update to 5.4.0 nightly builds
+
 * Mon Feb 10 2012 Clément David <c.david86 at gmail.com> - 5.3.3-9
 - Update classpath.xml due to the jhdf5 move.
 
@@ -281,10 +302,10 @@ s:%lang(C) ::
 - Update classpath.xml due to the flexdock move.
 
 * Tue Nov 22 2011 Clément David <c.david86 at gmail.com> - 5.3.3-5
-- use %{_hdf5_version} to avoid runtime crash
+- use %%{_hdf5_version} to avoid runtime crash
 
 * Thu Nov 17 2011 Clément David <c.david86 at gmail.com> - 5.3.3-4
-- use %{hdf5ver} to avoid runtime crash
+- use %%{hdf5ver} to avoid runtime crash
 
 * Wed Nov  9 2011 <c.david86 at gmail.com> 5.3.3-3
 - Remove dependency on atlas (need only lapack ABI)
diff --git a/sources b/sources
index 9d7cd5f..c68ef89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0211096464d0bb2e097154d62ef827bd  scilab-5.3.3-src.tar.gz
+90db7b08551f00ae28d68d45e26b5a42  scilab-master-1333395999-src.tar.gz
