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#73e2177198c33e59de08c18da57d5a54321551ab

vim-update.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 debug=""
 #debug="echo "
-branches=( "master" "f33" "f32" "f31" )
-releases=( "fc34" "fc33" "fc32" "fc31" )
-regexps=( "fc34" "\|fc33" "\|fc32" "\|fc31" )
-bodhi_enabled=( "0" "1" "1" "1" )
+branches=( "master" "f33" "f32" )
+releases=( "fc34" "fc33" "fc32" )
+regexps=( "fc34" "\|fc33" "\|fc32" )
+bodhi_enabled=( "0" "1" "1" )
 #releases_regexp=fc28\\\|fc27\\\|fc28
 
 branches_index=0

vim.spec

@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
 Source1: vim.sh
@@ -66,6 +66,8 @@ Patch3018: vim-crypto-warning.patch
 
 # gcc is no longer in buildroot by default
 BuildRequires: gcc
+# uses make
+BuildRequires: make
 
 BuildRequires: python3-devel ncurses-devel gettext perl-devel
 BuildRequires: perl-generators
@@ -824,6 +826,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
 
 %changelog
+* Thu Nov 05 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1941-2
+- make is no longer in buildroot by default
+- disable F31 updating
+
 * Mon Nov 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1941-1
 - patchlevel 1941