summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Alff2021-02-16 11:22:39 -0500
committerTed Alff2021-02-16 11:22:39 -0500
commite846ac034a460371fad8e537ecfb53071948bad7 (patch)
tree72105e0d371c1a148660aeebfbb0efd0c61c9692
parent417047a45ca3731c47f3a7bfc93d1c7fe7aa625f (diff)
downloadaur-e846ac034a460371fad8e537ecfb53071948bad7.tar.gz
Add conflicts with dockbarx
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD3
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 266a2e898f5..44f9159f0cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = dockbarx-git
pkgdesc = TaskBar with groupping and group manipulation
- pkgver = 1.0beta+r850+a3e2186
+ pkgver = 1.0beta+r854+698cf25
pkgrel = 1
epoch = 1
url = https://github.com/M7S/dockbarx
@@ -26,7 +26,8 @@ pkgbase = dockbarx-git
optdepends = python-pyudev: dockx battery applet
optdepends = gconf: export settings from older versions of dockbarx
optdepends = python-lxml: import settings script
- provides = dockbarx=1.0beta+r850+a3e2186
+ provides = dockbarx=1.0beta+r854+698cf25
+ conflicts = dockbarx
source = dockbarx::git+https://github.com/xuzhen/dockbarx.git#branch=pygi-python3
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d8bb7179fbf..037f5c4229e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname=dockbarx
pkgname=${_pkgname}-git
epoch=1
_pkgver=1.0beta
-pkgver=1.0beta+r850+a3e2186
+pkgver=1.0beta+r854+698cf25
pkgrel=1
pkgdesc="TaskBar with groupping and group manipulation"
arch=('i688' 'x86_64' 'armv7h' 'aarch64')
@@ -20,6 +20,7 @@ optdepends=('mate-panel: mate applet'
'gconf: export settings from older versions of dockbarx'
'python-lxml: import settings script')
provides=("${_pkgname}=${pkgver}")
+conflicts=("${_pkgname}")
_branch='pygi-python3'
source=("${_pkgname}::git+https://github.com/xuzhen/dockbarx.git#branch=${_branch}")
sha256sums=('SKIP')