summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2021-10-15 14:26:27 -0600
committerMark Wagie2021-10-15 14:26:27 -0600
commitbd7365cffe35d5d7b16c577fc87c0c72c9aa1b9f (patch)
tree3bfba2d49e19e8ffb65008a50e6c9269b4fd9e02
parentaf0d29a1e3332ab205b182ce5db05dba003a820e (diff)
downloadaur-bd7365cffe35d5d7b16c577fc87c0c72c9aa1b9f.tar.gz
correct package name
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD15
2 files changed, 14 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ed57654c035..17bacddc2ec2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pop-launcher-git
- pkgver = 1.0.1.r2.g5eb5b22
- pkgrel = 1
+ pkgver = 1.0.1.r10.g55c1b6e
+ pkgrel = 2
url = https://github.com/pop-os/launcher
arch = x86_64
arch = aarch64
@@ -19,9 +19,10 @@ pkgname = pop-launcher-git
provides = pop-launcher
conflicts = pop-launcher
-pkgname = pop-launcher-system76-power-git
+pkgname = pop-shell-plugin-system76-power-git
pkgdesc = System76 Power scripts for the launcher
- depends = pop-launcher
+ depends = pop-shell
depends = system76-power
- provides = pop-launcher-system76-power
+ conflicts = pop-shell-plugin-system76-power
conflicts = pop-launcher-system76-power
+ replaces = pop-launcher-system76-power-git
diff --git a/PKGBUILD b/PKGBUILD
index a0b5389a887e..9012a1fb21ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
-pkgname=('pop-launcher-git' 'pop-launcher-system76-power-git')
+pkgname=('pop-launcher-git' 'pop-shell-plugin-system76-power-git')
pkgbase=pop-launcher-git
-pkgver=1.0.1.r2.g5eb5b22
-pkgrel=1
+pkgver=1.0.1.r10.g55c1b6e
+pkgrel=2
arch=('x86_64' 'aarch64')
url="https://github.com/pop-os/launcher"
license=('GPL3')
@@ -18,6 +18,7 @@ pkgver() {
prepare() {
cd "$srcdir/launcher"
+ export RUSTUP_TOOLCHAIN=stable
cargo fetch --target "$CARCH-unknown-linux-gnu"
}
@@ -41,11 +42,11 @@ package_pop-launcher-git() {
rm -rf "$pkgdir/usr/lib/${pkgbase%-git}/scripts/system76-power"
}
-package_pop-launcher-system76-power-git() {
+package_pop-shell-plugin-system76-power-git() {
pkgdesc="System76 Power scripts for the launcher"
- depends=('pop-launcher' 'system76-power')
- provides=("${pkgname%-git}")
- conflicts=("${pkgname%-git}")
+ depends=('pop-shell' 'system76-power')
+ conflicts=("${pkgname%-git}" 'pop-launcher-system76-power')
+ replaces=('pop-launcher-system76-power-git')
cd "$srcdir/launcher"
install -d "$pkgdir/usr/lib/${pkgbase%-git}/scripts"