[scilab/f16: 5/5] Merge branch 'master' into f16

[Clément David]

commit f65f81b0650c7061e501de0096574ae74e115822
Merge: 6f88c58 3e8862d
Author: Clément DAVID <c.david86 at gmail.com>
Date:   Mon Jan 2 18:54:23 2012 +0100

    Merge branch 'master' into f16

 scilab.spec |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --cc scilab.spec
index d407070,76b25b6..663c5ea
--- a/scilab.spec
+++ b/scilab.spec
@@@ -268,9 -268,15 +270,15 @@@ s:%lang(C) :
  %{_datadir}/%{name}/modules/*/tests
  
  %changelog
- * Mon Dec  5 2011 <c.david86 at gmail.com> 5.3.3-4
+ * Mon Jan  2 2012 Clément David <c.david86 at gmail.com> - 5.3.3-6
+ - 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
++* Mon Dec  5 2011 <c.david86 at gmail.com> 5.3.3-5
 +- Add saxon dependency
  
 -* Thu Nov 17 2011 Clément David <c.david86 at gmail.com> - 5.3.3-4
 -- use %{hdf5ver} to avoid runtime crash
++* Tue Nov 22 2011 Clément David <c.david86 at gmail.com> - 5.3.3-4
++- use %{_hdf5_version} 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)
  - Use noarch package on doc and tests