From 39d881b77a9d4f2836846e4e533c2243d723f124 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 22 Feb 2021 07:30:28 +0000 Subject: [PATCH] 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#fd9785cccbf7804a46092532d5888349f614b888 --- .gitignore | 1 + sources | 2 +- vim-update.sh | 4 ++++ vim.spec | 6 +++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d628bc56..f1a52df4 100644 --- a/.gitignore +++ b/.gitignore @@ -343,3 +343,4 @@ /vim-8.2-2465.tar.bz2 /vim-8.2-2488.tar.bz2 /vim-8.2-2529.tar.bz2 +/vim-8.2-2541.tar.bz2 diff --git a/sources b/sources index 8cde02cf..f0aeecdd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2529.tar.bz2) = 154405302e8790d4f972011e5679a755d9f2d9334e9e5e3dd3c38b13753a21cbf32766b61185c9b76a9b88124eef6fd1c85a11b2451522536ba15345f826c902 +SHA512 (vim-8.2-2541.tar.bz2) = dbe254c609dac6fecd96ab8347f04bc6260efe0bf6703cc835dc46d952186db58508b5810adedc2e05ddccc663e67a14353f21ec8b712aded9921953af54be80 diff --git a/vim-update.sh b/vim-update.sh index 362ee634..34184df8 100755 --- a/vim-update.sh +++ b/vim-update.sh @@ -197,4 +197,8 @@ fi #go back to rawhide $debug fedpkg switch-branch rawhide +# clean up the downloaded vim-upstream repo - to prevent changes in it and breaking update process +# prevents #1931099 +$debug rm -rf vim-upstream + exit 0 diff --git a/vim.spec b/vim.spec index 10f1118f..f4df9d40 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2529 +%define patchlevel 2541 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -820,6 +820,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon Feb 22 2021 Zdenek Dohnal - 2:8.2.2541-1 +- patchlevel 2541 +- 1931099 - Build version numbers don't match the actual build patchlevel + * Thu Feb 18 2021 Zdenek Dohnal - 2:8.2.2529-1 - patchlevel 2529