upgraded to version 6.0.0

3 files changed, 34 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a46da6ccf17..39fe967ad458 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = scilab-bin
-	pkgdesc = A scientific software package for numerical computations.
-	pkgver = 5.5.2
+	pkgdesc = A software package for numerical computation, providing a powerful computing environment for engineering and scientific applications.
+	pkgver = 6.0.0
 	pkgrel = 1
 	url = https://www.scilab.org
 	arch = x86_64
 	arch = i686
 	license = BSD
 	license = custom:CeCILL
-	source = scilab.sh
-	md5sums = 32bba7f8af6ead4bdacfe40a67d4b30e
-	source_x86_64 = http://www.scilab.org/download/5.5.2/scilab-5.5.2.bin.linux-x86_64.tar.gz
-	md5sums_x86_64 = c24553bc2bf9871d71decd99c2d73d78
-	source_i686 = http://www.scilab.org/download/5.5.2/scilab-5.5.2.bin.linux-i686.tar.gz
-	md5sums_i686 = 71d794854e85d484b12a8b8c954f03c4
+	conflicts = scilab
+	options = !strip
+	source_x86_64 = http://www.scilab.org/download/6.0.0/scilab-6.0.0.bin.linux-x86_64.tar.gz
+	sha256sums_x86_64 = 2d09e7ae7b7e01ef4e56fa138ebeaac78f225c3e657c569a09bfff67117de7d6
+	source_i686 = http://www.scilab.org/download/6.0.0/scilab-6.0.0.bin.linux-x86_64.tar.gz
+	sha256sums_i686 = c61bd5dd8f02675649e198dccb32ba7b114a254e984b48f73e7aaf8ddb8f1b52
 
 pkgname = scilab-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 39be435e8757..1e1247e679e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,40 @@
-# Maintainer: Marcel Hasler <mahasler at gmail dot com>
+# Maintainer  : George Eleftheriou <eleftg>
+# Contributor : Marcel Hasler <mahasler at gmail dot com>
 
 pkgname=scilab-bin
-pkgver=5.5.2
+_pkgname=${pkgname%-bin}
+pkgver=6.0.0
 pkgrel=1
-pkgdesc="A scientific software package for numerical computations."
+pkgdesc="A software package for numerical computation, providing a powerful computing environment for engineering and scientific applications."
 arch=("x86_64" "i686")
 license=("BSD" "custom:CeCILL")
 url="https://www.scilab.org"
-
-source=("scilab.sh")
-md5sums=("32bba7f8af6ead4bdacfe40a67d4b30e")
-
-source_x86_64=("http://www.scilab.org/download/${pkgver}/scilab-${pkgver}.bin.linux-x86_64.tar.gz")
-md5sums_x86_64=("c24553bc2bf9871d71decd99c2d73d78")
-
-source_i686=("http://www.scilab.org/download/${pkgver}/scilab-${pkgver}.bin.linux-i686.tar.gz")
-md5sums_i686=("71d794854e85d484b12a8b8c954f03c4")
-
 # Standalone package
 depends=()
+conflicts=('scilab')
+options=(!strip)
+source_x86_64=("http://www.scilab.org/download/${pkgver}/scilab-${pkgver}.bin.linux-${CARCH}.tar.gz")
+source_i686=("http://www.scilab.org/download/${pkgver}/scilab-${pkgver}.bin.linux-${CARCH}.tar.gz")
+sha256sums_x86_64=("2d09e7ae7b7e01ef4e56fa138ebeaac78f225c3e657c569a09bfff67117de7d6")
+sha256sums_i686=("c61bd5dd8f02675649e198dccb32ba7b114a254e984b48f73e7aaf8ddb8f1b52")
+
+prepare() {
+  cd "${srcdir}/${_pkgname}-${pkgver}/share/applications"
+  sed -i "s|Exec=scilab-adv-cli|Exec=/opt/scilab/bin/scilab-adv-cli|" scilab-adv-cli.desktop
+  sed -i "s|Exec=scilab-cli|Exec=/opt/scilab/bin/scilab-cli|" scilab-cli.desktop
+  sed -i "s|Exec=scilab -f|Exec=/opt/scilab/bin/scilab -f %f|" scilab.desktop
+  sed -i "s|Exec=scinotes|Exec=/opt/scilab/bin/scinotes|" scinotes.desktop
+  sed -i "s|Exec=xcos|Exec=/opt/scilab/bin/xcos|" xcos.desktop
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+}
 
 package() {
-  cd "${srcdir}"
-
   install -d "${pkgdir}/opt"
-  cp -r "${srcdir}/scilab-${pkgver}" "${pkgdir}/opt/scilab"
-
-  install -Dm 644 "${srcdir}/scilab-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-
+  cp -a "${srcdir}/${_pkgname}-${pkgver}" "${pkgdir}/opt/${_pkgname}"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  install -Dm 644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
   install -d "${pkgdir}/usr/share/applications"
-  install -Dm 644 "${srcdir}/scilab-${pkgver}/share/applications/scilab.desktop" "${pkgdir}/usr/share/applications/scilab.desktop"
-
+  install -Dm 644 share/applications/*.desktop "${pkgdir}/usr/share/applications"
   install -d "${pkgdir}/usr/share/icons"
-  cp -r "${srcdir}/scilab-${pkgver}/share/icons/hicolor" "${pkgdir}/usr/share/icons/"
-
-  install -Dm 755 scilab.sh "${pkgdir}/usr/bin/scilab"
+  cp -a share/icons/hicolor "${pkgdir}/usr/share/icons"
 }
diff --git a/scilab.sh b/scilab.sh
deleted file mode 100755
index 567d36e5bbaa..000000000000
--- a/scilab.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-LD_LIBRARY_PATH+=:/opt/scilab /opt/scilab/bin/scilab "$@"
-