Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/vim.git#e59c5ebce8c7d43a3b2dfa556273d8f58a77a3d5

.gitignore

@@ -334,3 +334,5 @@
 /vim-8.2-2018.tar.bz2
 /vim-8.2-2072.tar.bz2
 /vim-8.2-2086.tar.bz2
+/vim-8.2-2108.tar.bz2
+/vim-8.2-2115.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (vim-8.2-2086.tar.bz2) = 16dfa2404dbe39bd4139cf7947b22dc4c17327f15a33e08ef2bc1d019c54640c88b8519cc964744475db7b46abccab85f723e36a361de185436d5f4351535e95
+SHA512 (vim-8.2-2115.tar.bz2) = 7fcf4a0f55b70280f8251cf1c0e46d5cbd0a4e5cb98df0f36600defffc8e0f641c23f6f88f3124fad29aa6c3f6cc7f0e3950af0403b14e1f5691203e879c1564

vim.sh

@@ -8,7 +8,11 @@ if [ -n "${BASH_VERSION-}" -o -n "${KSH_VERSION-}" -o -n "${ZSH_VERSION-}" ]; th
         ;;
     -/usr/bin/vi)
         # apply only if founded vi is in expected dir from distro
-        alias vim="read -rep $'No vim found, using vi, press ENTER to continue\n' -n1 -t 20 -s && vi"
+        if [ -n "${ZSH_VERSION-}" ]; then
+          alias vim="read -t 10 -s -k 1 '?No vim found, using vi, press ENTER to continue...' && echo '' && vi"
+        else
+          alias vim="read -rep $'No vim found, using vi, press ENTER to continue...\n' -n1 -t 10 -s && vi"
+        fi
         ;;
   esac
 fi

vim.spec

@@ -1,4 +1,4 @@
-%define patchlevel 2086
+%define patchlevel 2115
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -826,6 +826,15 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
 
 %changelog
+* Wed Dec 09 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2115-1
+- patchlevel 2115
+
+* Wed Dec 09 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2108-2
+- 1902772 - "vim" from vim-minimal defunct on zsh
+
+* Tue Dec 08 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2108-1
+- patchlevel 2108
+
 * Fri Dec 04 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2086-1
 - patchlevel 2086