summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Ellithorpe2017-07-17 23:13:41 -0700
committerJosh Ellithorpe2017-07-17 23:13:41 -0700
commitd4e6cc858588860c1583e60d2d18bd335e742288 (patch)
tree3d6bea3c577adf1b86a2489ae256d3f6a483493f
parenta996ec6718e853361f3750e9fb367b5fc819a83f (diff)
downloadaur-d4e6cc858588860c1583e60d2d18bd335e742288.tar.gz
Doesn't conflict with bitcoin-qt, as wallet is a different package
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ec7e35e5f28..581f7f75024c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Jul 18 05:38:11 UTC 2017
+# Tue Jul 18 06:12:57 UTC 2017
pkgbase = bitcoin-abc
pkgdesc = Bitcoin ABC node
pkgver = 0.14.3
@@ -25,7 +25,6 @@ pkgbase = bitcoin-abc
provides = bitcoin-tx
conflicts = bitcoin-cli
conflicts = bitcoin-daemon
- conflicts = bitcoin-qt
conflicts = bitcoin-tx
backup = etc/bitcoin/bitcoin.conf
backup = etc/logrotate.d/bitcoin
@@ -34,11 +33,13 @@ pkgbase = bitcoin-abc
source = bitcoin.logrotate
source = bitcoin.service
source = bitcoin-reindex.service
+ source = bitcoin.install
sha256sums = 5e2d5ee094ce35b4b57506fee1ac1116a4872a7bd3e62f0668e0766d59d4b934
sha256sums = b1908344281498d39bfa40c3b9725f9c95bf22602cd46e6120a1f17bad9dae35
sha256sums = 8f05207b586916d489b7d25a68eaacf6e678d7cbb5bfbac551903506b32f904f
sha256sums = 9643eed2c20d78a9c7347df64099765773615f79d3b8a95693d871c933516880
sha256sums = 35ff9331d7df8b90adfc7d82752cca4f8b7ff23a29e5d10b07e4e3fc78050679
+ sha256sums = 1f661c616ce5eae6a84fe0f36f6a307b8a0ed4718d5559e08992117d7d1aeecb
pkgname = bitcoin-abc
diff --git a/PKGBUILD b/PKGBUILD
index a6db3d6155ce..a114366d2928 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,7 +33,7 @@ sha256sums=('5e2d5ee094ce35b4b57506fee1ac1116a4872a7bd3e62f0668e0766d59d4b934'
backup=('etc/bitcoin/bitcoin.conf'
'etc/logrotate.d/bitcoin')
provides=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx')
-conflicts=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-qt' 'bitcoin-tx')
+conflicts=('bitcoin-cli' 'bitcoin-daemon' 'bitcoin-tx')
install=bitcoin.install
# half of available processing units or one if only one is available