v4.10.1

2 files changed, 31 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbb927bf0872..54ded21cc22b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = geph4-client
-	pkgdesc = A command-line Geph4 toolset
-	pkgver = 4.9.2
+	pkgdesc = The command-line Geph client
+	pkgver = 4.10.1
 	pkgrel = 1
-	url = https://github.com/geph-official/geph4
+	url = https://github.com/geph-official/geph4-client
 	arch = x86_64
-	groups = geph4
 	license = GPL3
-	makedepends = rust
+	makedepends = cargo
 	depends = gcc-libs
-	conflicts = geph4-client-git
+	depends = glibc
 	options = !lto
 	backup = etc/default/geph4-client
+	source = geph4-client-4.10.1.tar.gz::https://github.com/geph-official/geph4-client/archive/v4.10.1.tar.gz
 	source = geph4-client.default
 	source = geph4-client.service
-	source = geph4-client-4.9.2.tar.gz::https://github.com/geph-official/geph4/archive/v4.9.2.tar.gz
+	sha256sums = ab464320196fdb57eee8e105cdb9a60b8769d06db92eb4f496cf3277e669caeb
 	sha256sums = 4e6ac4d3e31d7bf0fd4cb4b9269bbb124501a07a4701ce9728e857751773e4dd
 	sha256sums = e3d7e3afb1b524e93e60a80a21773a16de17643865bdf6a1a1f2e17fc2cc8e2d
-	sha256sums = 2eec1319f1bc7f1a5f28c6451bc655cdcab64327b98c345ea20ff4ac6fc5d0f2
 
 pkgname = geph4-client
diff --git a/PKGBUILD b/PKGBUILD
index 10d7f252f6de..7b5673b68f2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,41 @@
 # Maintainer: Dct Mei <dctxmei at yandex dot com>
-# Co-Maintainer:  RogueGirl <3a33oxx40 at mozmail dot com>
+# Co-Maintainer: RogueGirl <3a33oxx40 at mozmail dot com>
 
 pkgname=geph4-client
-pkgver=4.9.2
+pkgver=4.10.1
 pkgrel=1
-pkgdesc="A command-line Geph4 toolset"
+pkgdesc="The command-line Geph client"
 arch=('x86_64')
-url="https://github.com/geph-official/geph4"
+url="https://github.com/geph-official/geph4-client"
 license=('GPL3')
-groups=('geph4')
-depends=('gcc-libs')
-makedepends=('rust')
-conflicts=('geph4-client-git')
+depends=('gcc-libs' 'glibc')
+makedepends=('cargo')
 backup=('etc/default/geph4-client')
 options=('!lto')
-source=("geph4-client.default"
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
+        "geph4-client.default"
         "geph4-client.service")
-sha256sums=('4e6ac4d3e31d7bf0fd4cb4b9269bbb124501a07a4701ce9728e857751773e4dd'
-            'e3d7e3afb1b524e93e60a80a21773a16de17643865bdf6a1a1f2e17fc2cc8e2d'
-            '2eec1319f1bc7f1a5f28c6451bc655cdcab64327b98c345ea20ff4ac6fc5d0f2')
+sha256sums=('ab464320196fdb57eee8e105cdb9a60b8769d06db92eb4f496cf3277e669caeb'
+            '4e6ac4d3e31d7bf0fd4cb4b9269bbb124501a07a4701ce9728e857751773e4dd'
+            'e3d7e3afb1b524e93e60a80a21773a16de17643865bdf6a1a1f2e17fc2cc8e2d')
 
-_prepare() {
-    if [[ "${pkgver}" =~ '.alpha' ]]; then
-        _pkgver="${pkgver%%.alpha*}"
-        _alpha="${pkgver#*.alpha}"
-        source+=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${_pkgver}-alpha${_alpha}.tar.gz")
-        _pkgver="${_pkgver}-alpha${_alpha}"
-    elif [[ "${pkgver}" =~ '.beta' ]]; then
-        _pkgver="${pkgver%%.beta*}"
-        _beta="${pkgver#*.beta}"
-        source+=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${_pkgver}-beta${_beta}.tar.gz")
-        _pkgver="${_pkgver}-beta${_beta}"
-    else
-        source+=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
-        _pkgver="${pkgver}"
-    fi
+prepare() {
+    cd "${pkgname}-${pkgver}"
+    export RUSTUP_TOOLCHAIN=stable
+    cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
-_prepare
-
 build() {
-    cd "${srcdir}"/"${pkgname}-${_pkgver}"/
-    cargo build --release --manifest-path=Cargo.toml
+    cd "${pkgname}-${pkgver}"
+    export RUSTUP_TOOLCHAIN=stable
+    export CARGO_TARGET_DIR=target
+    cargo build --frozen --release
 }
 
 package() {
-    cd "${srcdir}"/"${pkgname}-${_pkgver}"/
-    install -Dm 644 LICENSE.md "${pkgdir}"/usr/share/licenses/geph4-client/LICENSE
-    install -Dm 755 target/release/geph4-client -t "${pkgdir}"/usr/bin/
-    install -Dm 644 "${srcdir}"/geph4-client.default "${pkgdir}"/etc/default/geph4-client
-    install -Dm 644 "${srcdir}"/geph4-client.service -t "${pkgdir}"/usr/lib/systemd/system/
+    cd "${pkgname}-${pkgver}"
+    install -Dm755 "target/release/${pkgname}" -t "${pkgdir}/usr/bin/"
+    install -Dm644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm644 "${srcdir}/geph4-client.default" "${pkgdir}/etc/default/geph4-client"
+    install -Dm644 "${srcdir}/geph4-client.service" -t "${pkgdir}/usr/lib/systemd/system/"
 }