Added paraview support using paraview-salome from AUR. Fixes and cleanup

1 files changed, 11 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 066ef4117d3f..3792f9a6579c 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 # Maintainer:  saxonbeta <saxonbeta at gmail __com
 pkgname=elmerfem
 pkgver=8.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Simulation tool for CFD, FEM, electromagnetics, heat transfer and others featuring a PDE solver."
 arch=('i686' 'x86_64')
 url="http://www.csc.fi/english/pages/elmer"
 license=('GPL')
-depends=('qwt' 'vtk' 'arpack' 'glu' 'tk')
+depends=('qwt' 'vtk' 'arpack' 'glu' 'tk' 'paraview-salome')
 makedepends=('gcc-fortran' 'cmake')
 conflicts=('elmerfem-git')
 options=(!emptydirs !makeflags)
@@ -30,6 +30,7 @@ build() {
         -DWITH_OpenMP:BOOL=TRUE \
         -DWITH_QWT:BOOL=TRUE \
         -DWITH_VTK:BOOL=TRUE \
+        -DWITH_PARAVIEW:BOOL=TRUE \
         -DWITH_ELMERGUI:BOOL=TRUE \
         -DWITH_ELMERGUILOGGER:BOOL=TRUE \
         -DWITH_ELMERPOST:BOOL=TRUE
@@ -44,13 +45,18 @@ package() {
     
     mkdir -p "${pkgdir}/usr/share/applications/"
     mkdir -p "${pkgdir}/usr/share/pixmaps/"
+    mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}/"
     
     install -D -m644 "ElmerGUI/Application/images/logo.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/"
     
     ln -s ElmerSolver_mpi "${pkgdir}/usr/bin/ElmerSolver"
-    rm -- $pkgdir/usr/lib/{libparpack.so,libarpack.so}
-    mv $pkgdir/usr/share/elmersolver/lib/*.so $pkgdir/usr/lib
-    cp $pkgdir/usr/share/ElmerGUI/edf-extra/* ${pkgdir}/usr/share/ElmerGUI/edf/
+    
+    #Clean up and move stuff in place
+    rm -- "$pkgdir"/usr/lib/{libparpack.so,libarpack.so}
+    mv "$pkgdir"/usr/share/elmersolver/lib/*.so "$pkgdir"/usr/lib
+    cp "$pkgdir"/usr/share/ElmerGUI/edf-extra/* "$pkgdir"/usr/share/ElmerGUI/edf/
+    mv "$pkgdir"/usr/share/ElmerGUI/license_texts/GPL_EXCEPTION "$pkgdir"/usr/share/licenses/${pkgname}/
+    rm "$pkgdir"/usr/share/ElmerGUI/license_texts/*
 }