Updated to compile on archlinux current

3 files changed, 20 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea4fb43f8a96..ec21d4b9f0af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jun  3 17:30:15 UTC 2016
 pkgbase = salome-aster
 	pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - ASTER Module
 	pkgver = 2015.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.code-aster.org/V2/spip.php?article295
 	arch = i686
 	arch = x86_64
@@ -15,7 +17,7 @@ pkgbase = salome-aster
 	source = salome-aster.profile
 	md5sums = 653acb524798af15345153941365d8d6
 	md5sums = a78eae0b1937f06ced8e7f570b05f94b
-	md5sums = 06386b053b5ab14dceea6532aa4e9bf5
+	md5sums = 53f87bee8b437e3f6771cf68fae34274
 
 pkgname = salome-aster
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ad91008614c..70aa066b974a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=salome-aster
 pkgver=2015.2
 _pkgsubver=2
-pkgrel=1
+pkgrel=2
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - ASTER Module"
 url="http://www.code-aster.org/V2/spip.php?article295"
 depends=('salome-gui>=7.6.0' 'salome-gui<7.7.0' 'aster' 'astk')
@@ -13,7 +13,9 @@ license=('LGPL')
 source=("https://bitbucket.org/code_aster/salome-codeaster/get/${pkgver}.tar.gz" "http://www.code-aster.org/FICHIERS/SALOME-MECA-${pkgver}-LGPL-${_pkgsubver}.tgz" ${pkgname}.profile)
 
 _source=code_aster-salome-codeaster-e854b3295450
-_installdir=/opt/salome/aster
+_basedir=/opt/salome
+_installdir=${_basedir}
+_profiledir=${_basedir}/env.d
 
 prepare() {
   # extracts salome_meca (we need salome_pyutils)
@@ -34,7 +36,7 @@ build() {
 }
 
 package() {
-  source /etc/salome/profile.d/salome-kernel.sh
+  source ${_profiledir}/salome-kernel.sh
 
   cd "$srcdir/$_source"
   python2 setup.py install --prefix="${_installdir}" --root="${pkgdir}"
@@ -42,8 +44,8 @@ package() {
   mv "${srcdir}/V2015_2/tools/Salomemeca_pyutils-${pkgver:0:4}${pkgver:5:1}/lib/python2.7/site-packages"/* "${pkgdir}${_installdir}/lib/python2.7/site-packages/"
   
   install -D -m755 "${srcdir}/${pkgname}.profile" \
-                   "${pkgdir}/etc/salome/profile.d/${pkgname}.sh"
+                   "${pkgdir}${_profiledir}/${pkgname}.sh"
 }
 md5sums=('653acb524798af15345153941365d8d6'
          'a78eae0b1937f06ced8e7f570b05f94b'
-         '06386b053b5ab14dceea6532aa4e9bf5')
+         '53f87bee8b437e3f6771cf68fae34274')
diff --git a/salome-aster.profile b/salome-aster.profile
index 83ea72d26e69..981a6d650211 100644
--- a/salome-aster.profile
+++ b/salome-aster.profile
@@ -1,4 +1,10 @@
-export ASTER_ROOT_DIR=/opt/salome/aster
-export ASTER_ROOT=/opt/aster
+export ASTER_ROOT_DIR=/opt/salome
+export ASTER_ROOT=/usr
 
-export PYTHONPATH=$ASTER_ROOT_DIR/lib/python2.7/site-packages:$ASTER_ROOT_DIR/lib/python2.7/site-packages/salome:$PYTHONPATH
+_aster_pythonpath=$ASTER_ROOT_DIR/lib/python${_pythonver}/site-packages/salome
+if [[ $PYTHONPATH != *${_aster_pythonpath}* ]]; then
+  export PYTHONPATH=${_aster_pythonpath}:$PYTHONPATH
+fi
+
+_pyutils_pythonpath=$ASTER_ROOT_DIR/lib/python${_pythonver}/site-packages
+export PYTHONPATH=${_pyutils_pythonpath}:$PYTHONPATH