Update to v3.6.0

2 files changed, 8 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd9fc127fadf..30344b0fc093 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed Feb 17 19:33:14 UTC 2016
 pkgbase = mantid
 	pkgdesc = Data analysis toolkit for neutron based instrument data
-	pkgver = 3.5.0
+	pkgver = 3.6.0
 	pkgrel = 1
 	url = http://www.mantidproject.org/
 	arch = x86_64
@@ -24,7 +26,8 @@ pkgbase = mantid
 	depends = python2-scipy
 	depends = python2-sip
 	depends = hdf5-cpp-fortran
-	source = mantid::git://github.com/mantidproject/mantid.git#tag=v3.5.0
+	depends = gsl
+	source = mantid::git://github.com/mantidproject/mantid.git#tag=v3.6.0
 	sha1sums = SKIP
 
 pkgname = mantid
diff --git a/PKGBUILD b/PKGBUILD
index 9d87361ef32c..bacca7944287 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Harry Jeffery <harry|@|exec64|.|co|.|uk>
 
 pkgname=mantid
-pkgver=3.5.0
+pkgver=3.6.0
 pkgrel=1
 pkgdesc="Data analysis toolkit for neutron based instrument data"
 url="http://www.mantidproject.org/"
@@ -25,25 +25,19 @@ depends=(
   'python2-scipy'
   'python2-sip'
   'hdf5-cpp-fortran'
+  'gsl'
   )
 makedepends=('cmake')
 source=("$pkgname::git://github.com/mantidproject/mantid.git#tag=v${pkgver}")
 sha1sums=('SKIP')
 
-prepare() {
-  #Currently the build fails because sphinx_bootstrap_theme isn't found
-  #However it'll sidestep that requirement if it doesn't even find sphinx,
-  #so for now let's just not build the built-in docs.
-  sed -i -e 's/SPHINX_FOUND/FALSE/g' ${srcdir}/mantid/Code/Mantid/docs/CMakeLists.txt
-}
-
 build() {
   mkdir -p "${srcdir}/build"
   cd "${srcdir}/build"
   cmake -DENABLE_OPENCASCADE=OFF \
         -DPYTHON_EXECUTABLE=/usr/bin/python2 \
         -DPYQT4_SIP_DIR=/usr/share/sip/PyQt4 \
-        "${srcdir}/mantid/Code/Mantid"
+        "${srcdir}/mantid"
   make
 }