summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Whitfield2017-10-11 11:40:42 -0400
committerRoss Whitfield2017-10-11 11:40:42 -0400
commit3c991248f5e29f267f3513383ee679630ac3179f (patch)
treedacce4adfe7c62d2305a30d995db6f3e35dbea4a
parent5637f8c0cf77c35e7600fba102ba19de1e2c957d (diff)
downloadaur-mantid.tar.gz
Update to v3.11.0
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD11
2 files changed, 7 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 001000a863e7..10004ec0f38c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mantid
pkgdesc = Data analysis toolkit for neutron based instrument data
- pkgver = 3.10.1
- pkgrel = 2
+ pkgver = 3.11.0
+ pkgrel = 1
url = http://www.mantidproject.org/
arch = x86_64
arch = i686
@@ -37,10 +37,8 @@ pkgbase = mantid
depends = qtwebkit
depends = qwt5
depends = qwtplot3d
- source = mantid::git+https://github.com/mantidproject/mantid.git#tag=v3.10.1
- source = https://github.com/mantidproject/mantid/pull/19889.patch
+ source = mantid::git+https://github.com/mantidproject/mantid.git#tag=v3.11.0
sha1sums = SKIP
- sha1sums = cf774c353e3487a9770eeb7652dc87abb66c56f4
pkgname = mantid
diff --git a/PKGBUILD b/PKGBUILD
index 9c769121e78b..eecada13d541 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Harry Jeffery <harry|@|exec64|.|co|.|uk>
pkgname=mantid
-pkgver=3.10.1
-pkgrel=2
+pkgver=3.11.0
+pkgrel=1
pkgdesc="Data analysis toolkit for neutron based instrument data"
url="http://www.mantidproject.org/"
arch=('x86_64' 'i686')
@@ -44,14 +44,11 @@ makedepends=(
'python2-sphinx'
'python2-sphinx-bootstrap-theme'
)
-source=("$pkgname::git+https://github.com/mantidproject/mantid.git#tag=v${pkgver}"
- "https://github.com/mantidproject/mantid/pull/19889.patch")
-sha1sums=('SKIP'
- 'cf774c353e3487a9770eeb7652dc87abb66c56f4')
+source=("$pkgname::git+https://github.com/mantidproject/mantid.git#tag=v${pkgver}")
+sha1sums=('SKIP')
build() {
cd "${srcdir}/mantid"
- patch -p1 -i "${srcdir}/19889.patch"
mkdir -p "${srcdir}/build"
cd "${srcdir}/build"
cmake -DPYTHON_EXECUTABLE=/usr/bin/python2 \