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#ed68fc4c5176d9a3529c8d82d07ec1e626a3bfac
This commit is contained in:
DistroBaker 2020-11-06 06:52:30 +00:00
parent b40d2a3c7d
commit d9b4c57dfe
3 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View File

@ -329,3 +329,4 @@
/vim-8.2-1815.tar.bz2
/vim-8.2-1885.tar.bz2
/vim-8.2-1941.tar.bz2
/vim-8.2-1961.tar.bz2

View File

@ -1 +1 @@
SHA512 (vim-8.2-1941.tar.bz2) = ded21c61f43327f3dbd559d254a525f5ad0283f93910624b2694c482244a18027d7bf4dca787bf458ff10687ae85651975411a22a0e53fb1120dc08ac4a5fb2e
SHA512 (vim-8.2-1961.tar.bz2) = d716f29cd8ccd562fae9176cc1348747a7abb8a2b022c06a30b729ae0f2231a81d18702f6818966be066a2aefe59d5bb310ae317c8129336d92d6886734c1020

View File

@ -1,4 +1,4 @@
%define patchlevel 1941
%define patchlevel 1961
%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
%define WITH_SELINUX 1
%endif
@ -21,7 +21,7 @@ Summary: The VIM editor
URL: http://www.vim.org/
Name: vim
Version: %{baseversion}.%{patchlevel}
Release: 2%{?dist}
Release: 1%{?dist}
License: Vim and MIT
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
Source1: vim.sh
@ -826,6 +826,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
%changelog
* Fri Nov 06 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1961-1
- patchlevel 1961
* 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