diff --git a/v8.2.4542.tar.gz b/v9.0.0337.tar.gz similarity index 63% rename from v8.2.4542.tar.gz rename to v9.0.0337.tar.gz index 5f13b801d3e4038ad02ab17445b318f7c65e5b4c..80f9f2c50b6c772f1253990ff9dd0fb5c89b79bb 100644 Binary files a/v8.2.4542.tar.gz and b/v9.0.0337.tar.gz differ diff --git a/vim.spec b/vim.spec index 36bfbd6b40fdb77372feee6072e2d2c7e6a70941..5eb883df1f0b3e707e2b7ab99abee7d5158cde0f 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 1 %bcond_without gui %bcond_with default_editor %bcond_with libsodium_crypt @@ -24,10 +24,10 @@ %define withruby 0 %define withlua 1 -%define baseversion 8.2 -%define vimdir vim82 +%define baseversion 9.0 +%define vimdir vim90 -%define patchlevel 4542 +%define patchlevel 0337 Summary: The VIM editor URL: http://www.vim.org/ @@ -114,9 +114,17 @@ vi editor. Vi was the first real screen-based editor for UNIX, and is still very popular. VIM improves on vi by adding new features: multiple windows, multi-level undo, block highlighting and more. +%package doc +Summary: Documentation files for %{name} +Requires: vim-common = %{epoch}:%{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %package common Summary: The common files needed by any version of the VIM editor -Conflicts: %{name}-minimal < %{epoch}:8.2 +Conflicts: %{name}-minimal < %{epoch}:9.0 # shared files between common and minimal Requires: %{name}-data = %{epoch}:%{version}-%{release} Requires: %{name}-filesystem @@ -142,9 +150,9 @@ many different languages. %package minimal Summary: A minimal version of the VIM editor -Conflicts: %{name}-common < %{epoch}:8.2 -Conflicts: vim-wrappers < 2:8.2 -Obsoletes: vim-wrappers < 2:8.2.2488-1 +Conflicts: %{name}-common < %{epoch}:9.0 +Conflicts: vim-wrappers < 2:9.0 +Obsoletes: vim-wrappers < 2:9.0 Provides: vi Provides: %{_bindir}/vi # shared files between common and minimal @@ -161,7 +169,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 +Conflicts: vim-wrappers < 2:9.0 # vim bundles libvterm, which is used during build - so we need to provide # bundled libvterm for catching possible libvterm CVEs Provides: bundled(libvterm) @@ -274,9 +282,9 @@ vim-common package. %package data Summary: Shared data for Vi and Vim BuildArch: noarch -Conflicts: %{name}-common < 2:8.2 -Conflicts: %{name}-filesystem < 2:8.2 -Conflicts: %{name}-minimal < 2:8.2 +Conflicts: %{name}-common < 2:9.0 +Conflicts: %{name}-filesystem < 2:9.0 +Conflicts: %{name}-minimal < 2:9.0 %description data The subpackage is used for shipping files and directories, which need to be @@ -661,7 +669,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %files common %config(noreplace) %{_sysconfdir}/vimrc %{!?_licensedir:%global license %%doc} -%doc README* %doc runtime/docs %{_datadir}/%{name}/%{vimdir}/autoload %{_datadir}/%{name}/%{vimdir}/colors @@ -681,6 +688,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/%{name}/%{vimdir}/print %{_datadir}/%{name}/%{vimdir}/syntax %{_datadir}/%{name}/%{vimdir}/tutor +%{_datadir}/%{name}/%{vimdir}/import/dist/*.vim %if ! %{withvimspell} %{_datadir}/%{name}/%{vimdir}/spell @@ -751,6 +759,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %lang(ru) %{_mandir}/ru/man1/* %lang(tr) %{_mandir}/tr/man1/* +%files doc +%doc README* + %if %{withvimspell} %files spell %dir %{_datadir}/%{name}/%{vimdir}/spell @@ -893,6 +904,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %changelog +* Wed Aug 31 2022 mgb01105731 - 2:9.0-1 +- update vim to 9.0 + * Mon Mar 21 2022 Chunmei Xu - 2:8.2-3 - fix copy and paste