summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoractionless2020-03-17 21:42:31 +0100
committeractionless2020-03-17 21:42:31 +0100
commit62a3852f7760ea487490624fa7e704dbd1e6fd08 (patch)
tree6df41af40a38b13a5597e0e1dad6ec5ec2215705
parent76b873c94a8b632f0c5d9abe3f1fd2f90e6f0183 (diff)
downloadaur-62a3852f7760ea487490624fa7e704dbd1e6fd08.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 2aae4540ed31..40ae29c4fa3c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -25,6 +25,8 @@ pkgbase = themix-theme-materia-git
optdepends = themix-gui: GUI
provides = themix-theme-materia
conflicts = themix-theme-materia
+ conflicts = oomox
+ conflicts = oomox-git
options = !strip
source = git+https://github.com/themix-project/oomox.git#branch=master
source = materia-theme::git+https://github.com/nana-4/materia-theme.git#branch=master
diff --git a/PKGBUILD b/PKGBUILD
index 19963b8eed20..169f5df1fd34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -48,7 +48,11 @@ options=(
'!strip'
)
provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+ $_pkgname
+ 'oomox'
+ 'oomox-git'
+)
pkgver() {
cd "${srcdir}/${_reponame}"