summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bc3d5d27fdc0..ff6d31762fd1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Feb 16 01:43:36 UTC 2018
+# Fri Feb 16 05:53:13 UTC 2018
pkgbase = nanocurrency-git
pkgdesc = Nano (formerly RaiBlocks) is a cryptocurrency designed from the ground up for scalable instant transactions and zero transaction fees.
pkgver = 10.0.r1.g4e4bcf8d
@@ -16,8 +16,9 @@ pkgbase = nanocurrency-git
provides = raiblocks
provides = nanocurrency
conflicts = raiblocks
- conflicts = raiblocks-git,
+ conflicts = raiblocks-git
conflicts = raiblocks-node-git
+ conflicts = nanocurrency-node-git
source = nanowallet.desktop
source = nanowallet128.png
source = nano-node.service
diff --git a/PKGBUILD b/PKGBUILD
index debb45cfeda6..9dccb771ceea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ license=('BSD 2-clause')
makedepends=('cmake')
depends=('qt5-base' 'boost>=1.66.0' 'boost-libs>=1.66.0')
provides=(raiblocks nanocurrency)
-conflicts=("raiblocks" "raiblocks-git", "raiblocks-node-git")
+conflicts=("raiblocks" "raiblocks-git" "raiblocks-node-git" "nanocurrency-node-git")
install=install
pkgver() {
cd "raiblocks"