Fixed source URL

2 files changed, 10 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 722bf3175b81..11468f498214 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = conduit
 	pkgdesc = Simple, fast and reliable chat server powered by Matrix
 	pkgver = 0.7.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://conduit.rs/
 	arch = x86_64
 	arch = aarch64
@@ -10,16 +10,15 @@ pkgbase = conduit
 	license = Apache
 	makedepends = cargo
 	makedepends = clang
-	makedepends = git
 	makedepends = rust
 	depends = gcc-libs
 	backup = etc/conduit-matrix/conduit.toml
-	source = git+https://gitlab.com/famedly/conduit.git#commit=0c2cfda3ae923d9e922d5edf379e4d8976a52d4e
+	source = https://gitlab.com/famedly/conduit/-/archive/v0.7.0/conduit-v0.7.0.tar.gz
 	source = conduit.service
 	source = conduit.sysusers
 	source = conduit.tmpfiles
 	source = conduit.toml
-	b2sums = 9618e162eed16c3b6bb9b303bf41f08e3b9cc6fb709d2d8f1f69e4841790d957fa769b44a49b081c67b328b05c3bb913850d079af3a20a2baf31585f4cb01017
+	b2sums = ca7671ccfbeaf8fb578401752662db3d4b1c901ea58fe02317cc0dbb1619ec00893287719070ed1ba4b7e79db8df176b04198da781970d140b38f7e1cbaec646
 	b2sums = 3530a017149ce79371ec1b269c2a484f4782eea622f7a3d495bfb4577502e38f3ddf32cdd4e2a9b0d85efc62be28873203c2b0baaead405ae8eda4c686df9c0d
 	b2sums = 4d6acac3e3d43b63fb62c5c6cfc0c83609ee8787c0777b62355815d0c125c67b0063a3d3deff2eba92b502c3b2cf330a76671a45bcc6206faeffb87c38ce5e85
 	b2sums = d23699d33e02103f3854ef0dc02a64cc8bc4b6921bd443e4155574ca029e10b8a3f64e82904422a2df3b16ba84edfe15b5380c99b1e4c473189bb69bf63cecef
diff --git a/PKGBUILD b/PKGBUILD
index 982e6e9597e4..c4358087776f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,46 +4,39 @@
 
 pkgname="conduit"
 pkgver=0.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple, fast and reliable chat server powered by Matrix"
 arch=("x86_64" "aarch64" "armv7h" "armv6h")
 url="https://conduit.rs/"
 license=("Apache")
 conflict=("conduit-bin" "matrix-conduit-git")
 depends=("gcc-libs")
-makedepends=("cargo" "clang" "git" "rust")
+makedepends=("cargo" "clang" "rust")
 backup=("etc/conduit-matrix/$pkgname.toml")
-source=("git+https://gitlab.com/famedly/$pkgname.git#commit=0c2cfda3ae923d9e922d5edf379e4d8976a52d4e"
+source=("https://gitlab.com/famedly/conduit/-/archive/v$pkgver/conduit-v$pkgver.tar.gz"
         $pkgname.{service,sysusers,tmpfiles,toml})
-b2sums=('9618e162eed16c3b6bb9b303bf41f08e3b9cc6fb709d2d8f1f69e4841790d957fa769b44a49b081c67b328b05c3bb913850d079af3a20a2baf31585f4cb01017'
+b2sums=('ca7671ccfbeaf8fb578401752662db3d4b1c901ea58fe02317cc0dbb1619ec00893287719070ed1ba4b7e79db8df176b04198da781970d140b38f7e1cbaec646'
         '3530a017149ce79371ec1b269c2a484f4782eea622f7a3d495bfb4577502e38f3ddf32cdd4e2a9b0d85efc62be28873203c2b0baaead405ae8eda4c686df9c0d'
         '4d6acac3e3d43b63fb62c5c6cfc0c83609ee8787c0777b62355815d0c125c67b0063a3d3deff2eba92b502c3b2cf330a76671a45bcc6206faeffb87c38ce5e85'
         'd23699d33e02103f3854ef0dc02a64cc8bc4b6921bd443e4155574ca029e10b8a3f64e82904422a2df3b16ba84edfe15b5380c99b1e4c473189bb69bf63cecef'
         '7949dfa901d6e08d1c954695425a2c7239eb2271c896329a60bc9f7ec8a842cb1e9826efc3c4bf49434eb5c9ff3fd35c1c5cbad21a1b9d13745f078baebfcb96')
 
 prepare(){
- cd "$pkgname"
+ cd "$pkgname-v$pkgver"
  export RUSTUP_TOOLCHAIN=stable
  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build(){
- cd "$pkgname"
+ cd "$pkgname-v$pkgver"
  export RUSTUP_TOOLCHAIN=stable
  export CARGO_TARGET_DIR=target
  export RUST_BACKTRACE=1
  cargo build --frozen --release
 }
 
-# takes too long
-#check() {
-# cd "$pkgname"
-# export RUSTUP_TOOLCHAIN=stable
-# cargo test --frozen
-#}
-
 package(){
- install -v -D -m 755  "$pkgname/target/release/$pkgname" "$pkgdir/usr/bin/conduit-matrix"
+ install -v -D -m 755  "$pkgname-v$pkgver/target/release/$pkgname" "$pkgdir/usr/bin/conduit-matrix"
  install -v -D -m 0644 "$pkgname.service"  "$pkgdir/usr/lib/systemd/system/$pkgname-matrix.service"
  install -v -D -m 0644 "$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
  install -v -D -m 0644 "$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"