diff --git a/vim-9.1.0709.tar.gz b/v9.1.0764.tar.gz similarity index 66% rename from vim-9.1.0709.tar.gz rename to v9.1.0764.tar.gz index 63d11514cbcb4bbafa003b7f179e2cbb68b423f6..a7dc22fc601cd2c3c5fb38823d91ce3c736b152e 100644 Binary files a/vim-9.1.0709.tar.gz and b/v9.1.0764.tar.gz differ diff --git a/vim-9.0-spec-recognize-epoch.patch b/vim-9.0-spec-recognize-epoch.patch deleted file mode 100644 index 8d524d0a26bb4f380e14f4337e72b85b93d4f350..0000000000000000000000000000000000000000 --- a/vim-9.0-spec-recognize-epoch.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/runtime/ftplugin/spec.vim 2024-08-14 23:54:55.965484666 +0800 -+++ b/runtime/ftplugin/spec.vim 2024-08-14 23:53:19.990361345 +0800 -@@ -66,9 +65,11 @@ - endif - let line = 0 - let name = "" -+ let epoch = "" - let ver = "" - let rel = "" - let nameline = -1 -+ let epochline = -1 - let verline = -1 - let relline = -1 - let chgline = -1 -@@ -77,6 +78,9 @@ - if name == "" && linestr =~? '^Name:' - let nameline = line - let name = substitute(strpart(linestr,5), '^[ ]*\([^ ]\+\)[ ]*$','\1','') -+ elseif epoch == "" && linestr =~? '^Epoch:' -+ let epochline = line -+ let epoch = substitute(strpart(linestr,6), '^[ ]*\([^ ]\+\)[ ]*$','\1','') - elseif ver == "" && linestr =~? '^Version:' - let verline = line - let ver = substitute(strpart(linestr,8), '^[ ]*\([^ ]\+\)[ ]*$','\1','') -@@ -93,6 +97,7 @@ - if nameline != -1 && verline != -1 && relline != -1 - let include_release_info = exists("g:spec_chglog_release_info") - let name = s:ParseRpmVars(name, nameline) -+ let epoch = s:ParseRpmVars(epoch, epochline) - let ver = s:ParseRpmVars(ver, verline) - let rel = s:ParseRpmVars(rel, relline) - else -@@ -117,6 +122,9 @@ - if chgline != -1 - let tmptime = v:lc_time - language time C -+ if strlen(epoch) -+ let ver = epoch.":".ver -+ endif - let parsed_format = "* ".strftime(format)." - ".ver."-".rel - execute "language time" tmptime - let release_info = "+ ".name."-".ver."-".rel diff --git a/vim-9.1-specsyntax.patch b/vim-9.1-specsyntax.patch index 4000eac3a95a67865c19340890f546868d803074..67de12ebf3ecd03a199d4bcbb1e1ab0bcb548541 100644 --- a/vim-9.1-specsyntax.patch +++ b/vim-9.1-specsyntax.patch @@ -22,12 +22,3 @@ diff -up vim74/runtime/syntax/spec.vim.highlite vim74/runtime/syntax/spec.vim syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial "frequently used rpm env vars -@@ -111,7 +111,7 @@ - syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment - - "%% Scripts Section %% --syn region specScriptArea matchgroup=specSection start='^%\(prep\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 -+syn region specScriptArea matchgroup=specSection start='^%\(prep\|generate_buildrequires\|conf\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\|filetriggerin\|filetriggerun\|filetriggerpostun\|transfiletriggerin\|transfiletriggerun\|transfiletriggerpostun\)\>' skip='^%{\|^%\(define\|global\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 - - "%% Changelog Section %% - syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense diff --git a/vim.spec b/vim.spec index 68c0490b125bb56e66efaa41e2ca0ae104d3ade3..980391747c43637013a9702f32ee3b329e93a871 100644 --- a/vim.spec +++ b/vim.spec @@ -4,7 +4,7 @@ %{!?_with_netbeans__:%define _with_netbeans__ 1} %define baseversion 9.1 -%define patchlevel 0709 +%define patchlevel 0764 %define vimdir vim91 Name: vim @@ -14,7 +14,7 @@ Release: 1 Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text. License: Vim AND LGPL-2.1-or-later AND MIT AND GPL-1.0-only AND (GPL-2.0-only OR Vim) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-or-later AND GPL-3.0-or-later AND OPUBL-1.0 AND Apache-2.0 WITH Swift-exception URL: https://www.vim.org -Source0: https://github.com/vim/vim/archive/v%{baseversion}.%{patchlevel}.tar.gz#/vim-%{baseversion}.%{patchlevel}.tar.gz +Source0: https://github.com/vim/vim/archive/refs/tags/v%{version}.tar.gz Source1: virc Source2: vimrc @@ -22,7 +22,6 @@ Patch0000: vim-7.0-fixkeys.patch Patch0001: vim-9.1-specsyntax.patch Patch0002: vim-8.0-copy-paste.patch Patch0003: vim-python3-tests.patch -Patch0004: vim-9.0-spec-recognize-epoch.patch Patch0005: bugfix-rm-modify-info-version.patch BuildRequires: autoconf python3-devel ncurses-devel gettext perl-devel perl-generators gcc @@ -429,6 +428,9 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests." %{_mandir}/man1/evim.* %changelog +* Mon Oct 07 2024 Funda Wang - 2:9.1.0764-1 +- update to 9.1 patchlevel 0764 + * Mon Sep 02 2024 Funda Wang - 2:9.1.0709-1 - update to 9.1 patchlevel 0709