summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoractionless2020-03-17 21:42:13 +0100
committeractionless2020-03-17 21:42:13 +0100
commita4b15e2a662b9fa394b73cea3f2164a72263db1e (patch)
tree47767cb30ffec762a68477bdc4d961e1811c1007
parent58b78f56f1fd56bb1b0c50c89d82ec1898de8647 (diff)
downloadaur-a4b15e2a662b9fa394b73cea3f2164a72263db1e.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 790464746eed..e618eb0214ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,6 +22,8 @@ pkgbase = themix-theme-oomox-git
optdepends = themix-gui: GUI
provides = themix-theme-oomox
conflicts = themix-theme-oomox
+ conflicts = oomox
+ conflicts = oomox-git
options = !strip
source = oomox-gtk-theme::git+https://github.com/themix-project/oomox-gtk-theme.git#branch=master
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index bc4323609a9a..b53a2e13c4d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -40,7 +40,11 @@ options=(
'!strip'
)
provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+ $_pkgname
+ 'oomox'
+ 'oomox-git'
+)
pkgver() {
cd "${srcdir}/${_reponame}"