Merge branch 'f29' into f28

.gitignore

@@ -231,3 +231,4 @@
 /vim-8.1-451.tar.bz2
 /vim-8.1-483.tar.bz2
 /vim-8.1-497.tar.bz2
+/vim-8.1-511.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (vim-8.1-497.tar.bz2) = 98140ababe72b7a97127d1c36fa0aff216936a052edf7176d57a1af87ffb67d4bfc193c09e0b31099c07eb68d6709daf40586a32b0af0ff0a1672942f1152eae
+SHA512 (vim-8.1-511.tar.bz2) = d1505b9b0f56b6bc020fc8dcc490ea9c307f04b59d00d0f9ec55ef722becdd1c3868aedca39c5ee38be2092cad81f8579a5f970abe7cb5c893950ab08201a5d4

vim.spec

@@ -1,4 +1,4 @@
-%define patchlevel 497
+%define patchlevel 511
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -105,7 +105,7 @@ Conflicts: man-pages-it < 0.3.0-17
 Conflicts: man-pages-pl < 0.24-2
 Requires: %{name}-filesystem
 # conflicts in package because of manpage move (bug #1599663)
-Conflicts: %{name}-minimal < 8.0.1428-4
+Conflicts: %{name}-minimal < %{version}-%{release}
 
 %description common
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -131,7 +131,7 @@ Summary: A minimal version of the VIM editor
 Provides: vi = %{version}-%{release}
 Provides: %{_bindir}/vi
 # conflicts in package because of manpage move (bug #1599663)
-Conflicts: %{name}-common < 8.0.1428-4
+Conflicts: %{name}-common < %{version}-%{release}
 
 %description minimal
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -800,6 +800,12 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Nov 05 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.511-1
+- patchlevel 511
+
+* Mon Nov 05 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.497-2
+- 1646183 - Man file conflict for vim-minimal and vim-enhanced
+
 * Fri Oct 26 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.497-1
 - patchlevel 497