summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2bdcd7ec66e..e79b811db25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,6 +16,8 @@ pkgbase = themix-icons-suru-plus-git
optdepends = gnome-icon-theme-symbolic: fallback icons
provides = themix-icons-suru-plus
conflicts = themix-icons-suru-plus
+ conflicts = oomox
+ conflicts = oomox-git
options = !strip
source = git+https://github.com/themix-project/oomox.git#branch=master
source = suru-plus::git+https://github.com/gusbemacbe/suru-plus.git#branch=master
diff --git a/PKGBUILD b/PKGBUILD
index 75915daae3b..b8686c3e81e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -34,7 +34,11 @@ options=(
'!strip'
)
provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+ $_pkgname
+ 'oomox'
+ 'oomox-git'
+)
pkgver() {
cd "${srcdir}/${_reponame}"