update epoch patch

This commit is contained in:
Karsten Hopp 2012-08-06 18:46:02 +02:00
parent d484d1a1ac
commit dfd24f3f6d

View File

@ -1,18 +1,46 @@
42a43 --- vim73/runtime/ftplugin/spec.vim 2012-08-06 17:51:41.000000000 +0200
> let epoch = "" +++ /tmp/spec.vim 2012-08-06 17:51:07.730701143 +0200
46a48 @@ -40,10 +40,12 @@
> let epochline = -1 endif
53a56,58 let line = 0
> elseif (epoch == "" && linestr =~? '^Epoch:') let name = ""
> let epochline = line + let epoch = ""
> let epoch = substitute(strpart(linestr,6), '^[ ]*\([^ ]\+\)[ ]*$','\1','') let ver = ""
69a75 let rel = ""
> let epoch = s:ParseRpmVars(epoch, epochline) let nameline = -1
92c98,102 let verline = -1
< let release_info = ver."-".rel + let epochline = -1
--- let relline = -1
> if (epoch == "") let chgline = -1
> let release_info = ver."-".rel while (line <= line("$"))
> else @@ -51,6 +53,9 @@
> let release_info = epoch.":".ver."-".rel if (name == "" && linestr =~? '^Name:')
> endif 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','')
@@ -67,6 +72,7 @@
if (nameline != -1 && verline != -1 && relline != -1)
let include_release_info = 1
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
@@ -89,7 +95,11 @@
execute "language time C"
let parsed_format = "* ".strftime(format)
execute "language time " . save_time
- let release_info = ver."-".rel
+ if (epoch == "")
+ let release_info = ver."-".rel
+ else
+ let release_info = epoch.":".ver."-".rel
+ endif
let wrong_format = 0
let wrong_release = 0
let insert_line = 0