Recognize epoch when making spec changelog

(cherry picked from commit fd02c4901924d5324873190d962c48f6ce1ccbea)
This commit is contained in:
Funda Wang 2024-08-21 06:50:22 +08:00 committed by openeuler-sync-bot
parent 2bba6a8f99
commit f9fedd6cbc
2 changed files with 50 additions and 1 deletions

View File

@ -0,0 +1,42 @@
--- 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

View File

@ -14,7 +14,7 @@
Name: vim
Epoch: 2
Version: %{baseversion}.%{patchlevel}
Release: 9
Release: 10
Summary: Vim is a highly configurable text editor for efficiently creating and changing any kind of text.
License: Vim and MIT
URL: http://www.vim.org
@ -28,6 +28,7 @@ Patch0002: vim-7.4-fstabsyntax.patch
Patch0003: vim-7.4-globalsyntax.patch
Patch0004: vim-8.0-copy-paste.patch
Patch0005: vim-python3-tests.patch
Patch0006: vim-9.0-spec-recognize-epoch.patch
Patch6000: backport-CVE-2023-48233.patch
@ -455,6 +456,12 @@ LC_ALL=en_US.UTF-8 make -j1 test || echo "Warning: Please check tests."
%{_mandir}/man1/evim.*
%changelog
* Wed Aug 21 2024 Funda Wang <fundawang@yeah.net> - 2:9.0.2092-10
- Type:enhacement
- ID:NA
- SUG:NA
- DESC:Recognize epoch when making spec changelog
* Fri Aug 16 2024 zhangxianting <zhangxianting@uniontech.com> - 2:9.0.2092-9
- Type:CVE
- ID:CVE-2024-43374