Improved dependencies and PKGBUILD syntax

3 files changed, 17 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d040ad6ca1a5..d6b411d99640 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = certspotter
 	pkgdesc = Certificate Transparency Log Monitor
 	pkgver = 0.9
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/SSLMate/certspotter
 	arch = x86_64
 	license = MPL2
-	makedepends = go
-	source = https://github.com/SSLMate/certspotter/archive/0.9.tar.gz
+	makedepends = git
+	makedepends = go-pie
+	source = certspotter-0.9-4.tar.gz::https://github.com/SSLMate/certspotter/archive/0.9.tar.gz
 	sha256sums = ea377ae70a0a754c6ec07ec63d23a0fd4b41be714d9e67a8603a858edc7309fa
 
 pkgname = certspotter
diff --git a/.gitignore b/.gitignore
index b669a9b7602c..82b3c183d5d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # from https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
 *.tar
 *.tar.*
+*.rpm
 *.jar
 *.exe
 *.msi
@@ -10,5 +11,4 @@
 *.log.*
 *.sig
 
-pkg/
-src/
+*/
diff --git a/PKGBUILD b/PKGBUILD
index 137104bed7aa..b8d098f96035 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,30 @@
 # Maintainer: Daniel Peukert <dan.peukert@gmail.com>
 pkgname='certspotter'
 pkgver='0.9'
-pkgrel='3'
+pkgrel='4'
 pkgdesc='Certificate Transparency Log Monitor'
 arch=('x86_64')
 url="https://github.com/SSLMate/$pkgname"
 license=('MPL2')
-makedepends=('go')
-source=("$url/archive/$pkgver.tar.gz")
+makedepends=('git' 'go-pie')
+source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz")
 sha256sums=('ea377ae70a0a754c6ec07ec63d23a0fd4b41be714d9e67a8603a858edc7309fa')
 
+_gopath="$pkgname-$pkgver-$pkgrel-gopath"
+
 prepare() {
-	mkdir -p "$srcdir/gopath/src/software.sslmate.com/src/"
-	mv "$srcdir/$pkgname-$pkgver/" "$srcdir/gopath/src/software.sslmate.com/src/$pkgname/"
+	mkdir -p "$srcdir/$_gopath/src/software.sslmate.com/src/"
+	mv "$srcdir/$pkgname-$pkgver/" "$srcdir/$_gopath/src/software.sslmate.com/src/$pkgname/"
 
-	export GOPATH="$srcdir/gopath"
+	export GOPATH="$srcdir/$_gopath"
 	go get -d -v "software.sslmate.com/src/$pkgname/cmd/$pkgname"
 }
 
 build() {
-	export GOPATH="$srcdir/gopath"
-	go install -gcflags "all=-trimpath=${PWD}" -asmflags "all=-trimpath=${PWD}" -ldflags "-extldflags ${LDFLAGS}" "software.sslmate.com/src/$pkgname/cmd/$pkgname"
+	export GOPATH="$srcdir/$_gopath"
+	go install -gcflags "all=-trimpath=$PWD" -asmflags "all=-trimpath=$PWD" -ldflags "-extldflags $LDFLAGS" "software.sslmate.com/src/$pkgname/cmd/$pkgname"
 }
 
 package() {
-	install -Dm755 "$srcdir/gopath/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
+	install -Dm755 "$srcdir/$_gopath/bin/$pkgname" "$pkgdir/usr/bin/$pkgname"
 }