Updated to 7.8.0

1 files changed, 48 insertions, 30 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4ee52a812154..8f0e22890677 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,33 @@
 # Maintainer: Michele Mocciola <mickele>
 
 pkgname=salome-hexablock
-pkgver=7.6.0
-pkgrel=2
+pkgver=7.8.0
+pkgrel=1
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - HEXABLOCK Module"
 url="http://www.salome-platform.org"
-depends=('salome-geom>=7.6.0' 'salome-geom<7.7.0')
+depends=("salome-geom>=${pkgver}" "salome-geom<${pkgver:0:2}$((${pkgver:2:1}+1)).0")
 makedepends=('doxygen' 'python2-sphinx' 'swig2')
 arch=('i686' 'x86_64')
 license=('LGPL')
-source=(${pkgname}.profile)
+source=("http://files.salome-platform.org/Salome/Salome${pkgver}/src${pkgver}.tar.gz" "${pkgname}.sh")
 
-_source=hexablock
+#_source=hexablock
+_source=HEXABLOCK_SRC
 _basedir=/opt/salome
 _installdir=${_basedir}
 _profiledir=${_basedir}/env.d
 
 prepare() {
-  msg "Connecting to git server..."
+#  msg "Connecting to git server..."
+#  if [[ -d ${_source} ]] ; then
+#     rm -rf ${_source}
+#  fi
+#  git clone git://git.salome-platform.org/modules/${_source}.git
+#  cd ${_source}
+#  git checkout V${pkgver:0:1}_${pkgver:2:1}_${pkgver:4:1}
+#  msg "GIT checkout done or server timeout"
 
-  if [[ -d ${_source} ]] ; then
-     rm -rf ${_source}
-  fi
-
-  git clone git://git.salome-platform.org/modules/${_source}.git
-  cd ${_source}
-  git checkout V${pkgver:0:1}_${pkgver:2:1}_${pkgver:4:1}
-
-  msg "GIT checkout done or server timeout"
+  cd ${srcdir}/${_source}
 
   # python -> python2
   for _FILE in `grep -Rl "/usr/bin/env python" * `
@@ -45,16 +45,33 @@ build() {
   mkdir -p "$srcdir/$_source/build"
   cd "$srcdir/$_source/build"
 
-  cmake .. \
-     -DCMAKE_INSTALL_PREFIX=$_installdir \
-     -DCMAKE_CXX_STANDARD=98 \
-     -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-     -DSWIG_EXECUTABLE=/usr/bin/swig-2 \
-     -DLIBXML2_ROOT_DIR=/usr \
-     -DLibXml2_DIR=/usr/lib/cmake/libxml2 \
-     -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
-     -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build2 \
-     -DSPHINX_APIDOC_EXECUTABLE=/usr/bin/sphinx-apidoc2
+  # generic options
+  cmake_options+=" -DCMAKE_BUILD_TYPE=Release"
+  cmake_options+=" -DCMAKE_INSTALL_PREFIX=${_installdir}"
+
+  # debug options
+  cmake_options+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF"
+  cmake_options+=" -DSALOME_CMAKE_DEBUG:BOOL=OFF"
+
+  # mpi
+  cmake_options+=" -DSALOME_USE_MPI:BOOL=ON"
+
+  # python2
+  cmake_options+=" -DPYTHON_EXECUTABLE=/usr/bin/python2"
+
+  # sphinx-2
+  cmake_options+=" -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build2"
+  cmake_options+=" -DSPHINX_APIDOC_EXECUTABLE=/usr/bin/sphinx-apidoc2"
+
+  # swig2
+  cmake_options+=" -DSWIG_EXECUTABLE=/usr/bin/swig-2"
+
+  # libxml2
+  cmake_options+=" -DLIBXML2_ROOT_DIR=/usr"
+  cmake_options+=" -DLibXml2_DIR=/usr/lib/cmake/libxml2"
+  cmake_options+=" -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2"
+
+  cmake ${cmake_options} ..
      
   make
 }
@@ -70,10 +87,11 @@ package() {
     sed -i -e "s|${pkgdir}||" ${_FILE}
   done
   
-  rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
-
-  install -D -m755 "$srcdir/$pkgname.profile" \
-                  "${pkgdir}${_profiledir}/${pkgname}.sh"
+  # install profile
+  install -D -m755 "${srcdir}/${pkgname}.sh" \
+                   "${pkgdir}${_profiledir}/${pkgname}.sh"
 		   
+  rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
 }
-md5sums=('566edb75962f9d51c991648e48c198fa')
+md5sums=('0f6de10ad9d9c646fce3ca21a7dab46a'
+         '126ed628ad633e662af1a14dfe05a460')