[scilab/f17] Fix scilab startup script to handle /bin set first in the PATH

[Clément David]

commit 59a1a9a9403691207d5c9a1d5ae4dd0703f328a9
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Mon Dec 17 12:46:11 2012 +0100

    Fix scilab startup script to handle /bin set first in the PATH

 0009-update-bin-scilab-after-usr-move.patch |   12 ++++++++++++
 scilab.spec                                 |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/0009-update-bin-scilab-after-usr-move.patch b/0009-update-bin-scilab-after-usr-move.patch
new file mode 100644
index 0000000..c8c8df6
--- /dev/null
+++ b/0009-update-bin-scilab-after-usr-move.patch
@@ -0,0 +1,12 @@
+--- a/bin/scilab
++++ b/bin/scilab
+@@ -207,7 +207,8 @@ detect_scilab_path() {
+     # Use scilab-bin in the current dir if it exists
+     # If not, then start resolving symlinks until we find scilab-bin
+     found=0
+-    curdir=$(dirname "$progname")
++    cd $(dirname "$progname")
++    curdir=$(pwd -P)
+     PATH="$curdir:$PATH"
+ 
+     progbase=$(basename "$progname")
diff --git a/scilab.spec b/scilab.spec
index 5f0f4fb..2cd5fa0 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,6 +1,6 @@
 Name:           scilab
 Version:        5.3.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Scientific software package for numerical computations
 
 Group:          Applications/Engineering
@@ -18,6 +18,8 @@ Patch6:         0006-fix-incorrect-fsf-adress.patch
 Patch7:         0007-fix-zero-length.patch
 Patch8:         0008-fix-class-path-in-manifest.patch
 
+Patch9:         0009-update-bin-scilab-after-usr-move.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Dependencies are extracted from :
@@ -196,6 +198,7 @@ modules/scicos/macros/scicos_scicos/look_for_text.sci
 modules/scicos/macros/scicos_scicos/unhilite_modelica_block.sci
 EOF
 
+%patch9 -p1
 
 %build
 %configure PVM_ROOT=%{_datadir}/pvm3
@@ -268,6 +271,9 @@ s:%lang(C) ::
 %{_datadir}/%{name}/modules/*/tests
 
 %changelog
+* Mon Dec 17 2012 Clément David <c.david86 at gmail.com> - 5.3.3-11
+- Fix scilab startup script to handle /bin set first in the PATH
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3.3-10
 - Rebuilt for c++ ABI breakage