summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoractionless2020-03-17 21:42:29 +0100
committeractionless2020-03-17 21:42:29 +0100
commita8b18149dadb2c0abce81f6104f204b2cdc40760 (patch)
treed1642b99dd9be9b09b699223de8322effd7467d1
parent2872af2481c2aeecee4c47d47fad794692140e05 (diff)
downloadaur-a8b18149dadb2c0abce81f6104f204b2cdc40760.tar.gz
add conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3901e9e9bd43..7cc755122a7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,6 +24,8 @@ pkgbase = themix-gui-git
optdepends = xorg-xrdb: for the `xresources` theme
provides = themix-gui
conflicts = themix-gui
+ conflicts = oomox
+ conflicts = oomox-git
source = git+https://github.com/themix-project/oomox.git#branch=master
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 731c001887b5..613f8d7bab8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -42,7 +42,11 @@ optdepends=(
'xorg-xrdb: for the `xresources` theme'
)
provides=('themix-gui')
-conflicts=('themix-gui')
+conflicts=(
+ 'themix-gui'
+ 'oomox'
+ 'oomox-git'
+)
pkgver() {
cd "${srcdir}/oomox"