From 3b184a9b1b639e19082f2982982deff8782ed3aa Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 18 Feb 2021 07:41:55 +0100 Subject: [PATCH 1/4] compat package for wrappers --- vim.spec | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/vim.spec b/vim.spec index c37c94e7..d0a63e93 100644 --- a/vim.spec +++ b/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: virc @@ -126,10 +126,10 @@ Summary: A minimal version of the VIM editor # conflicts in package because of manpage move (bug #1599663) # remove when a new RHEL is released (current 8) Conflicts: %{name}-common < %{epoch}:8.1.1-1 -Conflicts: vim-wrappers < 2:8.2.2488-1 -Obsoletes: vim-wrappers < 2:8.2.2488-1 +Conflicts: vim-wrappers < 2:8.2.2488-2 Provides: vi Provides: %{_bindir}/vi +Requires: vim-wrappers-compat = %{epoch}:%{version}-%{release} %description minimal VIM (VIsual editor iMproved) is an updated and improved version of the @@ -142,8 +142,7 @@ only available when the vim-common package is installed. %package enhanced Summary: A version of the VIM editor which includes recent enhancements -Conflicts: vim-wrappers < 2:8.2.2488-1 -Obsoletes: vim-wrappers < 2:8.2.2488-1 +Conflicts: vim-wrappers < 2:8.2.2488-2 # vim bundles libvterm, which is used during build - so we need to provide # bundled libvterm for catching possible libvterm CVEs Provides: bundled(libvterm) @@ -151,6 +150,7 @@ Provides: vim Provides: %{_bindir}/mergetool Provides: %{_bindir}/vim Requires: vim-common = %{epoch}:%{version}-%{release} which +Requires: vim-wrappers-compat = %{epoch}:%{version}-%{release} # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim Suggests: python3 python3-libs @@ -237,6 +237,15 @@ Requires: vim-enhanced %description default-editor This subpackage contains files needed to set Vim as the default editor. +%package wrappers-compat +Summary: The compat package to solve the upgrade path after removing vim-wrappers +Conflicts: vim-wrappers < 2:8.2.2488-2 +Obsoletes: vim-wrappers < 2:8.2.2488-2 + +%description wrappers-compat +This package only exists to help transition vim-wrappers users to the original +vim files. It will be removed after end of F33 life cycle. + %prep %setup -q -b 0 -n %{vimdir} @@ -819,7 +828,12 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %dir %{_sysconfdir}/profile.d %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* +%files wrappers-compat + %changelog +* Mon Feb 15 2021 Zdenek Dohnal - 2:8.2.2488-2 +- rebuilt + * Tue Feb 09 2021 Zdenek Dohnal - 2:8.2.2488-1 - patchlevel 2488 From e019d047369c83a52d7c022b0ef58a474b3b9470 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 18 Feb 2021 07:43:51 +0100 Subject: [PATCH 2/4] - patchlevel 2529 --- .gitignore | 1 + sources | 2 +- vim.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 306bac14..d628bc56 100644 --- a/.gitignore +++ b/.gitignore @@ -342,3 +342,4 @@ /vim-8.2-2451.tar.bz2 /vim-8.2-2465.tar.bz2 /vim-8.2-2488.tar.bz2 +/vim-8.2-2529.tar.bz2 diff --git a/sources b/sources index a7ee04b2..8cde02cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2488.tar.bz2) = 84fec937ac5c1bb3c9f98500973df3454bd76b5b42318676cfe5cec592e8b4210d1b652c8b9824b734cda220ec5fdfd800ecea51a87b5b3cdb6efcaa11e89859 +SHA512 (vim-8.2-2529.tar.bz2) = 154405302e8790d4f972011e5679a755d9f2d9334e9e5e3dd3c38b13753a21cbf32766b61185c9b76a9b88124eef6fd1c85a11b2451522536ba15345f826c902 diff --git a/vim.spec b/vim.spec index d0a63e93..3d05f7cb 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2488 +%define patchlevel 2529 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -831,9 +831,12 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %files wrappers-compat %changelog -* Mon Feb 15 2021 Zdenek Dohnal - 2:8.2.2488-2 +* Thu Feb 18 2021 Zdenek Dohnal - 2:8.2.2529-2 - rebuilt +* Thu Feb 18 2021 Zdenek Dohnal - 2:8.2.2529-1 +- patchlevel 2529 + * Tue Feb 09 2021 Zdenek Dohnal - 2:8.2.2488-1 - patchlevel 2488 From 6b0d92f8140876633c976d3f243fb2bb507f53d5 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Thu, 18 Feb 2021 07:41:55 +0100 Subject: [PATCH 3/4] compat package for wrappers --- vim.spec | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/vim.spec b/vim.spec index f4df9d40..6e4d8377 100644 --- a/vim.spec +++ b/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: virc @@ -126,10 +126,11 @@ Summary: A minimal version of the VIM editor # conflicts in package because of manpage move (bug #1599663) # remove when a new RHEL is released (current 8) Conflicts: %{name}-common < %{epoch}:8.1.1-1 -Conflicts: vim-wrappers < 2:8.2.2488-1 -Obsoletes: vim-wrappers < 2:8.2.2488-1 +Conflicts: vim-wrappers < 2:8.2.2488-2 +Obsoletes: vim-wrappers < 2:8.2.2488-2 Provides: vi Provides: %{_bindir}/vi +Requires: vim-wrappers-compat = %{epoch}:%{version}-%{release} %description minimal VIM (VIsual editor iMproved) is an updated and improved version of the @@ -142,8 +143,7 @@ only available when the vim-common package is installed. %package enhanced Summary: A version of the VIM editor which includes recent enhancements -Conflicts: vim-wrappers < 2:8.2.2488-1 -Obsoletes: vim-wrappers < 2:8.2.2488-1 +Conflicts: vim-wrappers < 2:8.2.2488-2 # vim bundles libvterm, which is used during build - so we need to provide # bundled libvterm for catching possible libvterm CVEs Provides: bundled(libvterm) @@ -151,6 +151,7 @@ Provides: vim Provides: %{_bindir}/mergetool Provides: %{_bindir}/vim Requires: vim-common = %{epoch}:%{version}-%{release} which +Requires: vim-wrappers-compat = %{epoch}:%{version}-%{release} # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim Suggests: python3 python3-libs @@ -237,6 +238,15 @@ Requires: vim-enhanced %description default-editor This subpackage contains files needed to set Vim as the default editor. +%package wrappers-compat +Summary: The compat package to solve the upgrade path after removing vim-wrappers +Conflicts: vim-wrappers < 2:8.2.2488-2 +Obsoletes: vim-wrappers < 2:8.2.2488-2 + +%description wrappers-compat +This package only exists to help transition vim-wrappers users to the original +vim files. It will be removed after end of F33 life cycle. + %prep %setup -q -b 0 -n %{vimdir} @@ -819,7 +829,12 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %dir %{_sysconfdir}/profile.d %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* +%files wrappers-compat + %changelog +* Mon Mar 01 2021 Zdenek Dohnal - 2:8.2.2541-2 +- rebuilt + * Mon Feb 22 2021 Zdenek Dohnal - 2:8.2.2541-1 - patchlevel 2541 - 1931099 - Build version numbers don't match the actual build patchlevel From 8124dd481ec1c6fa2cff12643c31be8309f048db Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Mon, 1 Mar 2021 08:58:19 +0100 Subject: [PATCH 4/4] remove compat, use just obsolete in vim-minimal --- vim.spec | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/vim.spec b/vim.spec index e8623b4c..b9460a7e 100644 --- a/vim.spec +++ b/vim.spec @@ -127,13 +127,9 @@ Summary: A minimal version of the VIM editor # remove when a new RHEL is released (current 8) Conflicts: %{name}-common < %{epoch}:8.1.1-1 Conflicts: vim-wrappers < 2:8.2.2488-2 -<<<<<<< HEAD Obsoletes: vim-wrappers < 2:8.2.2488-2 -======= ->>>>>>> e019d047369c83a52d7c022b0ef58a474b3b9470 Provides: vi Provides: %{_bindir}/vi -Requires: vim-wrappers-compat = %{epoch}:%{version}-%{release} %description minimal VIM (VIsual editor iMproved) is an updated and improved version of the @@ -154,7 +150,6 @@ Provides: vim Provides: %{_bindir}/mergetool Provides: %{_bindir}/vim Requires: vim-common = %{epoch}:%{version}-%{release} which -Requires: vim-wrappers-compat = %{epoch}:%{version}-%{release} # suggest python3, python2, lua, ruby and perl packages because of their # embedded functionality in Vim/GVim Suggests: python3 python3-libs @@ -241,15 +236,6 @@ Requires: vim-enhanced %description default-editor This subpackage contains files needed to set Vim as the default editor. -%package wrappers-compat -Summary: The compat package to solve the upgrade path after removing vim-wrappers -Conflicts: vim-wrappers < 2:8.2.2488-2 -Obsoletes: vim-wrappers < 2:8.2.2488-2 - -%description wrappers-compat -This package only exists to help transition vim-wrappers users to the original -vim files. It will be removed after end of F33 life cycle. - %prep %setup -q -b 0 -n %{vimdir} @@ -832,7 +818,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %dir %{_sysconfdir}/profile.d %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* -%files wrappers-compat %changelog * Mon Mar 01 2021 Zdenek Dohnal - 2:8.2.2541-2