[scilab] Fix build after merge

[Clément David]

commit b1bdd1fc9eff1929f9cb14e6dfebee4af37ba541
Author: Clément DAVID <davidcl at fedoraproject.org>
Date:   Tue Apr 3 09:53:14 2012 +0200

    Fix build after merge

 0002-Update-saxon-dependency-wrong-version.patch |  420 ----------------------
 scilab.spec                                      |   71 +++--
 2 files changed, 41 insertions(+), 450 deletions(-)
---
diff --git a/scilab.spec b/scilab.spec
index 4e93a14..3116512 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 prerelease version set this settings to the selected date and commit,
 # to switch to a released version set them to 0.
@@ -101,14 +101,12 @@ BuildRequires:  liberation-sans-fonts
 
 # All optional dependencies are needed to provide a full-featured Scilab
 BuildRequires:  gettext-devel
-BuildRequires:  pvm
 BuildRequires:  fftw-devel
 BuildRequires:  matio-devel
 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
@@ -178,36 +176,27 @@ 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
@@ -236,14 +225,33 @@ s:%lang(en) ::
 s:%lang(C) ::
 /^$/d' >%{name}-doc.lang
 
+%check
+make check-TESTS
+
+%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
@@ -277,6 +285,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.2.20120403snap
+- Fix build after merge
+
 * 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