1.3.5.r20.gc207355-4

2 files changed, 40 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43194e1f30a8..382cf50f8ed8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,19 @@
 pkgbase = cpuminer-multi-git
-	pkgdesc = Multi-algo CPUMiner & Reference Cryptonote Miner (JSON-RPC 2.0) - GIT checkout
-	pkgver = v1.3.1.multi.r7.g7495361
-	pkgrel = 3
-	url = https://github.com/tpruvot/cpuminer-multi/
-	arch = i686
+	pkgdesc = Multi-algo CPUMiner & Reference Cryptonote Miner (JSON-RPC 2.0) - git version
+	pkgver = 1.3.5.r20.gc207355
+	pkgrel = 4
+	url = https://github.com/tpruvot/cpuminer-multi
 	arch = x86_64
-	license = GPLv2
+	license = GPL
+	makedepends = git
 	depends = curl
 	depends = jansson
-	replaces = cpuminer-multi
+	depends = openssl
+	provides = cpuminer
+	provides = cpuminer-multi
+	conflicts = cpuminer
 	source = git+https://github.com/tpruvot/cpuminer-multi.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = cpuminer-multi-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 50ae2ec0624c..070139f470d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,38 @@
-# Maintainer: Milian Reichardt <mreichardt95@gmail.com>
-pkgname=cpuminer-multi-git
-pkgver=v1.3.1.multi.r7.g7495361
+# Maintainer: 0x9fff00 <0x9fff00+git@protonmail.ch>
+# Contributor: Milian Reichardt <mreichardt95@gmail.com>
+
+_pkgname=cpuminer-multi
+pkgname=$_pkgname-git
+pkgver=1.3.5.r20.gc207355
+pkgrel=4
+pkgdesc='Multi-algo CPUMiner & Reference Cryptonote Miner (JSON-RPC 2.0) - git version'
+arch=('x86_64')
+url="https://github.com/tpruvot/$_pkgname"
+license=('GPL')
+depends=('curl' 'jansson' 'openssl')
+makedepends=('git')
+provides=('cpuminer' 'cpuminer-multi')
+conflicts=('cpuminer')
+source=("git+$url.git")
+sha256sums=('SKIP')
 
 pkgver() {
-	cd "cpuminer-multi"
-	git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$srcdir/$_pkgname"
+
+  git describe --long | sed 's/^v//;s/-multi-\([0-9]*-g[0-9A-Fa-f]*\)$/-r\1/;s/-/./g'
 }
-pkgrel=3
-pkgdesc="Multi-algo CPUMiner & Reference Cryptonote Miner (JSON-RPC 2.0) - GIT checkout"
-arch=('i686' 'x86_64')
-url="https://github.com/tpruvot/cpuminer-multi/"
-license=('GPLv2')
-replaces=('cpuminer-multi')
-depends=('curl' 'jansson')
-source=("git+https://github.com/tpruvot/cpuminer-multi.git")
-md5sums=('SKIP')
 
 build() {
-	cd "$srcdir/cpuminer-multi/"
-	./autogen.sh
-	./configure --with-crypto --with-curl --bindir=/usr/bin --libdir=/usr/lib --mandir=/usr/share/man
-	make
+  cd "$srcdir/$_pkgname"
+
+  CFLAGS+=' -Wa,--noexecstack'
+  ./autogen.sh
+  ./configure --prefix=/usr --with-crypto --with-curl
+  make
 }
 
 package() {
-	cd "$srcdir/cpuminer-multi/"
-	make DESTDIR="$pkgdir/" install
+  cd "$srcdir/$_pkgname"
+
+  make DESTDIR="$pkgdir/" install
 }