summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpancho horrillo2017-06-15 07:14:31 +0200
committerpancho horrillo2017-06-15 07:14:31 +0200
commitbaa31b3616df7407fee33d2135bb0b2d8df770b8 (patch)
tree8e819d2b01ad87b2813ca2df5172f342f029bd76
parent4153e7caebe4b164cbb44894bdc7cf665a713da1 (diff)
parent73727f2dc1dcba8e269d4038960281d1d3904739 (diff)
downloadaur-baa31b3616df7407fee33d2135bb0b2d8df770b8.tar.gz
Merge branch 'release/2.1.5-2'
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD16
2 files changed, 13 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9943ce77b606..aaa4837fad32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
# Generated by mksrcinfo v8
-# Mon May 1 13:56:37 UTC 2017
+# Thu Jun 15 05:03:21 UTC 2017
pkgbase = the_platinum_searcher
pkgdesc = A code search tool similar to ack and the_silver_searcher(ag)
pkgver = 2.1.5
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/monochromegane/the_platinum_searcher
- arch = i686
arch = x86_64
license = MIT
makedepends = git
makedepends = go
makedepends = mercurial
- provides = pt
provides = the_platinum_searcher
+ conflicts = the_platinum_searcher-bin
source = git+https://github.com/monochromegane/the_platinum_searcher.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fe4e8d4ab8bc..f8738c023022 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,14 @@
pkgname=the_platinum_searcher
pkgver=2.1.5
-pkgrel=1
-pkgdesc="A code search tool similar to ack and the_silver_searcher(ag)"
-arch=('i686' 'x86_64')
+pkgrel=2
+pkgdesc='A code search tool similar to ack and the_silver_searcher(ag)'
+arch=('x86_64')
makedepends=('git' 'go' 'mercurial')
-url="https://github.com/monochromegane/the_platinum_searcher"
+url='https://github.com/monochromegane/the_platinum_searcher'
license=('MIT')
-provides=('pt' 'the_platinum_searcher')
+provides=('the_platinum_searcher')
+conflicts=('the_platinum_searcher-bin')
source=('git+https://github.com/monochromegane/the_platinum_searcher.git')
md5sums=('SKIP')
@@ -18,7 +19,10 @@ build() {
mkdir -p "$repodir"
mv "$srcdir"/$pkgname "$repodir"
cd "$repodir"/$pkgname
- git checkout -q v$pkgver
+ #git checkout -q v$pkgver
+ # v2.1.5 + fix to build issue
+ git checkout -q c7d8eec66dca50773e6b4ee7dfdad2174860b9b1
+ unset GOBIN # prevent bin to end up elsewhere
GOPATH="$srcdir" go get -v ./...
}