Merge branch 'f29' into f28

.gitignore

@@ -229,3 +229,4 @@
 /vim-8.1-408.tar.bz2
 /vim-8.1-450.tar.bz2
 /vim-8.1-451.tar.bz2
+/vim-8.1-483.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (vim-8.1-451.tar.bz2) = f7df96718613cca8b95eef8fcadb8d280554b3ecfd9c6408e8d8d8c07e6473484a504f96ca14b64766d601f6a4bf5ae46068894105afd5a9fa4b07fabd3ff379
+SHA512 (vim-8.1-483.tar.bz2) = 958b26948c4a62cb889243f11d1caaaa5bffb30197b78ceecbb26238be955ef22e70aa34410b870c4fd283be400ab88199dfc651ff440216c99f8407087eaebe

vim.spec

@@ -1,4 +1,4 @@
-%define patchlevel 451
+%define patchlevel 483
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -535,6 +535,12 @@ chmod 0644 %{buildroot}/%{_sysconfdir}/profile.d/vim.*
 install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/virc
 install -p -m644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/vimrc
 
+# if Vim isn't built for Fedora, use redhat augroup
+%if 0%{?rhel} >= 7
+sed -i -e "s/augroup fedora/augroup redhat/" %{buildroot}/%{_sysconfdir}/vimrc
+sed -i -e "s/augroup fedora/augroup redhat/" %{buildroot}/%{_sysconfdir}/virc
+%endif
+
 mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
 install -p -m644 %{SOURCE16} %{buildroot}%{_rpmconfigdir}/macros.d/
 
@@ -795,6 +801,12 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Fri Oct 19 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.483-1
+- patchlevel 483
+
+* Fri Oct 19 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.451-2
+- 1640972 - vimrc/virc should reflect correct augroup
+
 * Fri Oct 05 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.451-1
 - patchlevel 451