summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoractionless2020-03-17 21:42:41 +0100
committeractionless2020-03-17 21:42:41 +0100
commit3e02feca9e1a7d0ac976ccde9bbf408f4e3aa9d1 (patch)
tree628fcdf38b6871bc3c60554098d8ad1792e6e080
parent6d467a99497f3b8378751b821c12e4be6f7474a4 (diff)
downloadaur-3e02feca9e1a7d0ac976ccde9bbf408f4e3aa9d1.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 3306ac433a1b..04fc63a4105c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,6 +17,8 @@ pkgbase = themix-icons-archdroid-git
optdepends = oxygen-icons: fallback icons
provides = themix-icons-archdroid
conflicts = themix-icons-archdroid
+ conflicts = oomox
+ conflicts = oomox-git
options = !strip
source = git+https://github.com/themix-project/oomox.git#branch=master
source = archdroid-icon-theme::git+https://github.com/themix-project/archdroid-icon-theme.git#branch=master
diff --git a/PKGBUILD b/PKGBUILD
index 1878789d3c16..1a42994ebc48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -35,7 +35,11 @@ options=(
'!strip'
)
provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+ $_pkgname
+ 'oomox'
+ 'oomox-git'
+)
pkgver() {
cd "${srcdir}/${_reponame}"