From 3761e410a8d531e6c6a0323e052830b2cc710c8d Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Thu, 18 Sep 2025 15:07:33 +0200
Subject: [PATCH] Fix rpminspect issues

Related: RHEL-112003
---
 vim.spec | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/vim.spec b/vim.spec
index 39b23039..88e53331 100644
--- a/vim.spec
+++ b/vim.spec
@@ -47,10 +47,7 @@ Source16: macros.vim
 
 Patch2002: vim-7.0-fixkeys.patch
 Patch2003: vim-7.4-specsyntax.patch
-%if %{withhunspell}
 Patch2011: vim-7.0-hunspell.patch
-BuildRequires: hunspell-devel
-%endif
 
 Patch3000: vim-7.4-syntax.patch
 Patch3002: vim-7.4-nowarnings.patch
@@ -141,6 +138,11 @@ BuildRequires: lua-devel
 Requires: desktop-file-utils
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
+
+%if %{withhunspell}
+BuildRequires: hunspell-devel
+%endif
+
 Epoch: 2
 Conflicts: filesystem < 3
 
@@ -158,7 +160,7 @@ Conflicts: man-pages-pl < 0.24-2
 Requires: %{name}-filesystem
 # it conflicts with older version of vim-minimal during update because of manpage
 # move
-Conflicts: %{name}-minimal < 8.0.1428-4
+Conflicts: %{name}-minimal < 2:8.0.1428-4
 
 %description common
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -181,11 +183,11 @@ many different languages.
 
 %package minimal
 Summary: A minimal version of the VIM editor
-Provides: vi = %{version}-%{release}
+Provides: vi = %{epoch}:%{version}-%{release}
 Provides: %{_bindir}/vi
 # it conflicts with older version of vim-common during update because of manpage
 # move
-Conflicts: %{name}-common < 8.0.1428-4
+Conflicts: %{name}-common < 2:8.0.1428-4
 
 %description minimal
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -200,7 +202,7 @@ package is installed.
 %package enhanced
 Summary: A version of the VIM editor which includes recent enhancements
 Requires: vim-common = %{epoch}:%{version}-%{release} which
-Provides: vim = %{version}-%{release}
+Provides: vim = %{epoch}:%{version}-%{release}
 Provides: %{_bindir}/mergetool
 Provides: %{_bindir}/vim
 # suggest python3, python2, lua, ruby and perl packages because of their 
@@ -231,7 +233,6 @@ need to install the vim-common package.
 %package filesystem
 Summary: VIM filesystem layout
 BuildArch: noarch
-
 %Description filesystem
 This package provides some directories which are required by other
 packages that add vim files, p.e.  additional syntax files or filetypes.
@@ -247,7 +248,7 @@ BuildRequires: libXpm-devel
 BuildRequires: libICE-devel
 
 Requires: vim-common = %{epoch}:%{version}-%{release} libattr >= 2.4 gtk3 
-Provides: gvim = %{version}-%{release}
+Provides: gvim = %{epoch}:%{version}-%{release}
 Provides: %{_bindir}/mergetool
 Provides: %{_bindir}/gvim
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))