Updated to 3.6.0

3 files changed, 21 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 547dc7b5b218..6306142f448b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = slepc
 	pkgdesc = Scalable library for Eigenvalue problem computations
-	pkgver = 3.5.3
-	pkgrel = 2
+	pkgver = 3.6.0
+	pkgrel = 1
 	url = http://www.grycap.upv.es/slepc
 	install = slepc.install
 	arch = i686
@@ -10,9 +10,9 @@ pkgbase = slepc
 	depends = python2
 	depends = gcc
 	depends = gcc-fortran
-	depends = petsc>=3.5.3
-	source = http://www.grycap.upv.es/slepc/download/distrib/slepc-3.5.3.tar.gz
-	md5sums = 417a691e5a756ba2a6dde7f156ff57a5
+	depends = petsc>=3.6.0
+	source = http://www.grycap.upv.es/slepc/download/distrib/slepc-3.6.0.tar.gz
+	md5sums = 560a634369fdab3fcaeea35c2cbab6f1
 
 pkgname = slepc
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d2b9a18b42f..a73447c3ec38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,22 @@
 # Maintainer: Myles English <myles at rockhead dot biz>
 pkgname=slepc
-pkgver=3.5.3
-_config=arch-linux2-cxx-opt
-pkgrel=2
+pkgver=3.6.0
+pkgrel=1
 pkgdesc="Scalable library for Eigenvalue problem computations"
 arch=('i686' 'x86_64')
 url="http://www.grycap.upv.es/slepc"
 license=('GNUv3')
-depends=('python2' 'gcc' 'gcc-fortran' 'petsc>=3.5.3')
+depends=('python2' 'gcc' 'gcc-fortran' 'petsc>=3.6.0')
 install=slepc.install
 source=(http://www.grycap.upv.es/slepc/download/distrib/${pkgname}-${pkgver/_/-}.tar.gz)
-md5sums=('417a691e5a756ba2a6dde7f156ff57a5')
-
-# get SLEPC_DIR
-source /etc/profile.d/petsc.sh    # gets PETSC_DIR
+md5sums=('560a634369fdab3fcaeea35c2cbab6f1')
 
 export MAKEFLAGS="-j1"
 
 build() {
+    # get SLEPC_DIR
+    source /etc/profile.d/petsc.sh    # gets PETSC_DIR
+
     _build_dir=${srcdir}/${pkgname}-${pkgver/_/-}
     _install_dir=/opt/slepc/`basename ${PETSC_DIR}`
 
@@ -33,6 +32,9 @@ build() {
 
 
 package() {
+    # get SLEPC_DIR
+    source /etc/profile.d/petsc.sh    # gets PETSC_DIR
+
     _build_dir=${srcdir}/${pkgname}-${pkgver/_/-}
     _install_dir=/opt/slepc/`basename ${PETSC_DIR}`
 
@@ -46,12 +48,12 @@ package() {
     export SLEPC_DIR=${_install_dir}
     unset PETSC_ARCH
 
-    sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/conf/slepc_rules"
-    sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/conf/slepc_variables"
-    sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/conf/slepcvariables"
-    sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/conf/uninstall.py"
+    sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/lib/slepc/conf/slepcrules"
+    sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/lib/slepc/conf/slepc_variables"
+    sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/lib/slepc/conf/slepcvariables"
+    sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/lib/slepc/conf/uninstall.py"
     sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/lib/pkgconfig/SLEPc.pc"
-    sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/lib/modules/3.5.3"
+    sed -i 's#'"${pkgdir}"'##g' "${pkgdir}${_install_dir}/lib/slepc/conf/modules/${pkgname}/${pkgver}"
 
     mkdir -p ${pkgdir}/etc/profile.d
     echo "export SLEPC_DIR=${_install_dir}" > ${pkgdir}/etc/profile.d/slepc.sh
diff --git a/slepc.install b/slepc.install
index 78f5a0794891..1dc6150d5742 100644
--- a/slepc.install
+++ b/slepc.install
@@ -13,7 +13,7 @@ cat << EOF
 
 2) Set your environment variable somewhere appropriate:
 
-export SLEPC_DIR=/opt/slepc/arch-linux2-cxx-opt
+export SLEPC_DIR=$SLEPC_DIR
 
 EOF
 }