Update pkgrel and conflict with spl-token

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5da415905cbe..dab6803d894d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = solana
 	pkgdesc = A fast, secure, and censorship resistant blockchain.
 	pkgver = 1.10.38
-	pkgrel = 2
+	pkgrel = 1
 	url = https://www.solana.com
 	arch = x86_64
 	license = Apache
 	makedepends = rustup
 	makedepends = clang
 	provides = solana
+	provides = spl-token
 	conflicts = solana-bin
+	conflicts = spl-token-cli
 	source = solana-1.10.38.tar.gz::https://github.com/solana-labs/solana/archive/v1.10.38.tar.gz
 	source = spl-token-cli-2.0.17.tar.gz::https://github.com/solana-labs/solana-program-library/archive/refs/tags/token-cli-v2.0.17.tar.gz
 	sha256sums = 276a5a7e12208770954e9bfa86339f49943767e9ad869fe6dd20bd7a4dfc4ea4
diff --git a/PKGBUILD b/PKGBUILD
index be312e4d2a8f..338c15410f51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@ pkgname=solana
 pkgver=1.10.38
 _tokenver=2.0.17
 _rustver=1.59.0
-pkgrel=2
+pkgrel=1
 pkgdesc="A fast, secure, and censorship resistant blockchain."
 url="https://www.solana.com"
 arch=('x86_64')
 license=('Apache')
 depends=()
 makedepends=("rustup" "clang")
-conflicts=("solana-bin")
-provides=("solana")
+conflicts=("solana-bin" "spl-token-cli")
+provides=("solana" "spl-token")
 source=("$pkgname-$pkgver.tar.gz::https://github.com/solana-labs/$pkgname/archive/v$pkgver.tar.gz"
         "spl-token-cli-$_tokenver.tar.gz::https://github.com/solana-labs/solana-program-library/archive/refs/tags/token-cli-v$_tokenver.tar.gz")
 sha256sums=('276a5a7e12208770954e9bfa86339f49943767e9ad869fe6dd20bd7a4dfc4ea4'