summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorredfish2018-04-28 16:28:36 -0400
committerredfish2018-04-28 16:28:36 -0400
commitd28ed1b73fc87f766f57fb207967cc56344443e2 (patch)
treee99163b978b7b3c5f2cd84345a0e7cb507b28199
parent23adb8666571921af61b89c8a37e3dd79278f282 (diff)
downloadaur-d28ed1b73fc87f766f57fb207967cc56344443e2.tar.gz
bump to 0.12.0.0
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD14
2 files changed, 13 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index af3f9788a069..27cf801ade56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Jan 14 23:09:12 UTC 2018
+# Sat Apr 28 20:27:36 UTC 2018
pkgbase = monero-git
pkgdesc = Peer-to-peer anonymous digital currency (daemon, CLI wallet, and wallet API library)
- pkgver = 0.11.1.0
+ pkgver = 0.12.0.0
pkgrel = 1
url = https://getmonero.org/
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 82d1a347c065..b914e9cdb7d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=('monero-git')
pkgname=('monero-git' 'libmonero-wallet-git')
_gitname='monero'
-pkgver=0.11.1.0
+pkgver=0.12.0.0
pkgrel=1
arch=('x86_64' 'i686' 'armv7h' 'aarch64')
url="https://getmonero.org/"
@@ -32,22 +32,30 @@ md5sums=('SKIP')
_builddir=build
+
pkgver() {
cd "$srcdir/$_gitname"
# Release tags might point to commits on a branch different than master,
# so don't use them.
#git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
- printf "$(echo $pkgver | grep -Eo '^[0-9]+.[0-9]+.[0-9]+.[0-9]+').r%s.%s" \
- "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ printf "$(echo $pkgver | sed 's/\.r.*//').r%s.g%s" \
+ "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
prepare() {
cd "$srcdir/$_gitname"
+ git submodule init
+ git submodule update
+
# To apply PRs
#git remote add up $_upstream
#git pull --no-edit up refs/pull/xxxx/head
+
+ cd external/miniupnp
+ git fetch origin refs/pull/3/head # cmake: do not install into system
+ git merge FETCH_HEAD
}
build() {