From 2c65b73641bdb1f1eb6a108c7f00e0c7ab0d6e45 Mon Sep 17 00:00:00 2001
From: Chunmei Xu <xuchunmei@linux.alibaba.com>
Date: Mon, 21 Mar 2022 16:44:37 +0800
Subject: [PATCH] optimise Conflicts version

Signed-off-by: Chunmei Xu <xuchunmei@linux.alibaba.com>
---
 vim.spec | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/vim.spec b/vim.spec
index 844c499..61dc5f4 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define anolis_release 1
+%define anolis_release 2
 %bcond_without gui
 %bcond_with default_editor
 %bcond_with libsodium_crypt
@@ -114,7 +114,7 @@ multiple windows, multi-level undo, block highlighting and more.
 
 %package common
 Summary: The common files needed by any version of the VIM editor
-Conflicts: %{name}-minimal < %{epoch}:8.2.3642-2
+Conflicts: %{name}-minimal < %{epoch}:8.2
 # shared files between common and minimal
 Requires: %{name}-data = %{epoch}:%{version}-%{release}
 Requires: %{name}-filesystem
@@ -140,8 +140,8 @@ many different languages.
 
 %package minimal
 Summary: A minimal version of the VIM editor
-Conflicts: %{name}-common < %{epoch}:8.2.3642-2
-Conflicts: vim-wrappers < 2:8.2.2488-1
+Conflicts: %{name}-common < %{epoch}:8.2
+Conflicts: vim-wrappers < 2:8.2
 Obsoletes: vim-wrappers < 2:8.2.2488-1
 Provides: vi
 Provides: %{_bindir}/vi
@@ -159,7 +159,7 @@ only available when the vim-common package is installed.
 
 %package enhanced
 Summary: A version of the VIM editor which includes recent enhancements
-Conflicts: vim-wrappers < 2:8.2.2488-1
+Conflicts: vim-wrappers < 2:8.2
 # vim bundles libvterm, which is used during build - so we need to provide
 # bundled libvterm for catching possible libvterm CVEs
 Provides: bundled(libvterm)
@@ -272,9 +272,9 @@ vim-common package.
 %package data
 Summary: Shared data for Vi and Vim
 BuildArch: noarch
-Conflicts: %{name}-common < 2:8.2.3642-2
-Conflicts: %{name}-filesystem < 2:8.2.3642-2
-Conflicts: %{name}-minimal < 2:8.2.3642-2
+Conflicts: %{name}-common < 2:8.2
+Conflicts: %{name}-filesystem < 2:8.2
+Conflicts: %{name}-minimal < 2:8.2
 
 %description data
 The subpackage is used for shipping files and directories, which need to be
@@ -890,6 +890,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %endif
 
 %changelog
+* Mon Mar 21 2022 Chunmei Xu <xuchunmei@linux.alibaba.com> - 2:8.2-2
+- optimise Conflicts version
+
 * Wed Mar  9 2022 Liwei Ge <liwei.glw@linux.alibaba.com> - 2:8.2-1
 - Init version from upstream v8.2
 - disbale ruby
-- 
Gitee