summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Enck2017-06-29 12:51:20 -0400
committerSean Enck2017-06-29 12:51:20 -0400
commit8ec8b3de1d6105e2ccb2b03b9d51857a1fb6b2d1 (patch)
tree9f47b68712dc42e1b8513446753a9d5d9eb5507a
parent4da58987046e94bbabe3cd765b0ed71c3525997a (diff)
downloadaur-8ec8b3de1d6105e2ccb2b03b9d51857a1fb6b2d1.tar.gz
change how vendor packages sare retrieved
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD21
2 files changed, 20 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e55dcea9ce5c..f4410537d19e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = oragono
pkgdesc = A modern IRC server written in Go.
- pkgver = 0.8.1
- pkgrel = 2
+ pkgver = 0.8.2
+ pkgrel = 1
url = https://github.com/oragono/oragono
install = install
arch = x86_64
@@ -9,10 +9,12 @@ pkgbase = oragono
makedepends = go
makedepends = git
backup = etc/oragono.conf
- source = git+https://github.com/oragono/oragono#tag=v0.8.1
+ source = git+https://github.com/oragono/oragono#tag=v0.8.2
+ source = git+https://github.com/oragono/oragono-vendor
source = oragono.service
source = path.patch
sha256sums = SKIP
+ sha256sums = SKIP
sha256sums = 131097e2803dee6f0b00de41b80fb790a44dd6c90bf1b1004078535150ff64cc
sha256sums = 25a1c0f764283059e95088f3b9cb66fe6a0c95df0d9dc8375856f41097c04fb0
diff --git a/PKGBUILD b/PKGBUILD
index 10959dbf623a..d98eafabee54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Sean Enck <enckse@gmail.com>
pkgname=oragono
-pkgver=0.8.1
-pkgrel=2
+pkgver=0.8.2
+pkgrel=1
pkgdesc="A modern IRC server written in Go."
arch=('x86_64')
url="https://github.com/oragono/oragono"
@@ -10,19 +10,28 @@ license=('MIT')
install=install
makedepends=('go' 'git')
source=("git+$url#tag=v$pkgver"
+ "git+https://github.com/oragono/oragono-vendor"
"oragono.service"
"path.patch")
sha256sums=('SKIP'
+ 'SKIP'
'131097e2803dee6f0b00de41b80fb790a44dd6c90bf1b1004078535150ff64cc'
'25a1c0f764283059e95088f3b9cb66fe6a0c95df0d9dc8375856f41097c04fb0')
backup=('etc/oragono.conf')
build() {
+ export GOPATH=$(pwd)/..
cd ${srcdir}/$pkgname
+ local _path=$(pwd)
+ git submodule init
+ git config submodule.vendor.url $srcdir/oragono-vendor
+ git submodule update
patch -p0 < ../../path.patch
- export GOPATH=$(pwd)
- go get -v -d
- local _oragono_git=$GOPATH/src/github.com/$pkgname/$pkgname
- git --git-dir=$_oragono_git/.git --work-tree=$_oragono_git checkout tags/v$pkgver
+ cd vendor/github.com/$pkgname
+ rm -rf $pkgname
+ mkdir -p $pkgname
+ ln -s $_path/irc $pkgname/irc
+ ln -s $_path/mkcerts $pkgname/mkcerts
+ cd $_path
make linux
echo "Arch Linux AUR: $pkgver-$pkgrel" >> build/linux/oragono.motd
}