From d90090d6c76a386fe31ad336a96179fc3255742c Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Sep 11 2017 16:36:11 +0000
Subject: 1487175 - VIm conflicts in man pages


---

diff --git a/vim.spec b/vim.spec
index d84c171..95c7d9b 100644
--- a/vim.spec
+++ b/vim.spec
@@ -100,6 +100,8 @@ Group: Applications/Editors
 Conflicts: man-pages-fr < 0.9.7-14
 Conflicts: man-pages-it < 0.3.0-17
 Conflicts: man-pages-pl < 0.24-2
+# Because of conflicting man pages
+Conflicts: %{name}-minimal < %{version}-%{release}
 Requires: %{name}-filesystem
 
 %description common
@@ -125,6 +127,8 @@ many different languages.
 %package minimal
 Summary: A minimal version of the VIM editor
 Group: Applications/Editors
+# Because of conflicting manpages
+Conflicts: %{name}-common < %{version}-%{release}
 Provides: vi = %{version}-%{release}
 Provides: /bin/vi
 
@@ -768,6 +772,7 @@ rm -rf %{buildroot}
 * Mon Sep 11 2017 Karsten Hopp <karsten@redhat.com> 8.0.1092-1
 - editing vim-update.sh for building package
 - patchlevel 1092
+- 1487175 - VIm conflicts in man pages
 
 * Fri Sep 08 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1071-2
 - fixing merge and push in vim-update.sh