diff --git a/vim-7.0-specedit.patch b/vim-7.0-specedit.patch deleted file mode 100644 index 74e327d..0000000 --- a/vim-7.0-specedit.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- vim70/runtime/ftplugin/spec.vim.rh1 2006-05-10 19:37:45.000000000 +0200 -+++ vim70/runtime/ftplugin/spec.vim 2006-11-13 12:21:32.000000000 +0100 -@@ -18,11 +18,18 @@ - - if !exists("*s:SpecChangelog") - function s:SpecChangelog(format) -+ let save_time = v:lc_time - if strlen(a:format) == 0 - if !exists("g:spec_chglog_format") -- let email = input("Email address: ") -- let g:spec_chglog_format = "%a %b %d %Y " . l:email -- echo "\r" -+ if !exists("g:packager") -+ let email = input("Email address: ") -+ let g:spec_chglog_format = "%a %b %d %Y " . l:email -+ echo "\r" -+ else -+ let email = g:packager -+ let g:spec_chglog_format = "%a %b %d %Y " . l:email -+ echo "\r" -+ endif - endif - let format = g:spec_chglog_format - else -@@ -58,7 +65,7 @@ - let line = line+1 - endwhile - if (nameline != -1 && verline != -1 && relline != -1) -- let include_release_info = exists("g:spec_chglog_release_info") -+ let include_release_info = 1 - let name = s:ParseRpmVars(name, nameline) - let ver = s:ParseRpmVars(ver, verline) - let rel = s:ParseRpmVars(rel, relline) -@@ -79,8 +86,10 @@ - endif - endif - if (chgline != -1) -+ execute "language time C" - let parsed_format = "* ".strftime(format) -- let release_info = "+ ".name."-".ver."-".rel -+ execute "language time " . save_time -+ let release_info = ver."-".rel - let wrong_format = 0 - let wrong_release = 0 - let insert_line = 0 -@@ -97,15 +106,14 @@ - execute relline - normal  - let rel = substitute(strpart(getline(relline),8), '^[ ]*\([^ ]\+\)[ ]*$','\1','') -- let release_info = "+ ".name."-".ver."-".rel -+ let release_info = ver."-".rel - endif - endif - let n = 0 -- call append(chgline+n, parsed_format) - if include_release_info -- let n = n + 1 -- call append(chgline+n, release_info) -+ let parsed_format = parsed_format." ".release_info - endif -+ call append(chgline+n, parsed_format) - let n = n + 1 - call append(chgline+n,"- ") - let n = n + 1 diff --git a/vim.spec b/vim.spec index 1ff4693..e56956a 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: 3%{?dist} +Release: 4%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -53,7 +53,6 @@ Patch3004: vim-7.0-rclocation.patch Patch3006: vim-7.4-checkhl.patch Patch3007: vim-7.4-fstabsyntax.patch Patch3008: vim-7.4-syncolor.patch -Patch3009: vim-7.0-specedit.patch Patch3010: vim-7.3-manpage-typo-668894-675480.patch Patch3011: vim-manpagefixes-948566.patch Patch3013: vim-7.4-globalsyntax.patch @@ -246,7 +245,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3006 -p1 %patch3007 -p1 -b .fstabsyntax %patch3008 -p1 -b .syncolor -#patch3009 -p1 %patch3010 -p1 %patch3011 -p1 %patch3013 -p1 @@ -790,6 +788,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Fri Jul 19 2019 Zdenek Dohnal - 2:8.1.1713-4 +- remove unused patch + * Fri Jul 19 2019 Zdenek Dohnal - 2:8.1.1713-3 - 1724126 - disable showing spec template for new file with .spec suffix - minor changes in spec.template - tabs->spaces