From: Karel Kočí <redacted>
Date: Mon, 22 Aug 2022 12:31:21 +0000 (+0200)
Subject: vim: variants conflict with each other
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=46c058468aeaf7747c2e94e579020aa7f595c649;p=openwrt-packages.git

vim: variants conflict with each other

This adds conflicts between the variants,
because they provide the same files, and it should not be
possible to install them side by side. Otherwise, it might happen that
half files would be from one variant and the other half from the
other.

Also, adds provides as if you request to install ``vim`` and
``vim-full``, then the request could be satisfied even they collide,
because ``vim-full`` provides ``vim`` package.

Signed-off-by: Karel Kočí <redacted>
Signed-off-by: Josef Schlehofer <redacted>
[add commit message]
---

diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index d093c032f..565f0f0ef 100644
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@@ -41,12 +41,16 @@ endef
 define Package/vim-full
   $(call Package/vim/Default)
   TITLE+= (Normal)
+  PROVIDES:=vim
+  CONFLICTS:=vim
 endef
 
 
 define Package/vim-fuller
   $(call Package/vim/Default)
   TITLE+= (Big)
+  PROVIDES:=vim vim-full
+  CONFLICTS:=vim vim-full
 endef
 
 define Package/vim-runtime