diff --git a/spec.vim b/spec.vim index abb1e82..eff5b04 100644 --- a/spec.vim +++ b/spec.vim @@ -1,3 +1,8 @@ +if exists("loaded_spec") || &cp + finish +endif +let loaded_spec = 1 + function! SKEL_spec() 0r /usr/share/vim/current/skeletons/skeleton.spec language time en_US diff --git a/suse.vimrc b/suse.vimrc index 274b1e0..e37a22a 100644 --- a/suse.vimrc +++ b/suse.vimrc @@ -1,19 +1,48 @@ -" /etc/vimrc (configuration file for vim only) +" /usr/etc/vimrc (configuration file for vim only) " author: Klaus Franken " author: Werner Fink " author: Florian La Roche -" version: 2017/04/28 +" version: 2021/02/22 " commented lines start with `"' +" enable syntax highlighting +if &t_Co > 2 || has("gui_running") + syntax on +endif + +" automatically indent lines (default) +" set noautoindent + +" select case-insenitiv search (not default) +" set ignorecase + +" show cursor line and column in the status line +set ruler + " show matching brackets set showmatch " display mode INSERT/REPLACE/... set showmode +" changes special characters in search patterns (default) +" set magic + " Required to be able to use keypad keys and map missed escape sequences set esckeys +" get easier to use and more user friendly vim defaults +" CAUTION: This option breaks some vi compatibility. +" Switch it off if you prefer real vi compatibility +set nocompatible + +" allow backspacing over everything in insert mode +set backspace=indent,eol,start + +" Complete longest common string, then each full match +" enable this for bash compatible behaviour +" set wildmode=longest,full + " Try to get the correct main terminal type if &term =~ "xterm" let myterm = "xterm" diff --git a/vim-8.0.1568-defaults.patch b/vim-8.0.1568-defaults.patch index c9e2118..bf2f8ec 100644 --- a/vim-8.0.1568-defaults.patch +++ b/vim-8.0.1568-defaults.patch @@ -25,10 +25,3 @@ Index: vim-8.2.2411/runtime/defaults.vim " Only do this part when Vim was compiled with the +eval feature. if 1 -@@ -139,3 +141,6 @@ if has('langmap') && exists('+langremap' - " compatible). - set nolangremap - endif -+ -+" include SUSE tweaks -+ru suse.vimrc diff --git a/vim-8.2.2411-globalvimrc.patch b/vim-8.2.2411-globalvimrc.patch new file mode 100644 index 0000000..7e08ad4 --- /dev/null +++ b/vim-8.2.2411-globalvimrc.patch @@ -0,0 +1,16 @@ +Index: vim-8.2.2411/src/main.c +=================================================================== +--- vim-8.2.2411.orig/src/main.c ++++ vim-8.2.2411/src/main.c +@@ -3130,7 +3130,10 @@ source_startup_scripts(mparm_T *parmp) + * Get system wide defaults, if the file name is defined. + */ + #ifdef SYS_VIMRC_FILE +- (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE, NULL); ++ if (do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE, NULL) == FAIL) ++ { ++ (void)do_source((char_u *)"$VIMRUNTIME/suse.vimrc", FALSE, DOSO_NONE, NULL); ++ } + #endif + #ifdef MACOS_X + (void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, diff --git a/vim-8.2.2411.tar.gz b/vim-8.2.2411.tar.gz deleted file mode 100644 index 036c755..0000000 --- a/vim-8.2.2411.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4f1948375334c1f5c61fde0dc4bd3b5c840610b54130a075450da7fc1c8a766 -size 15410451 diff --git a/vim-8.2.2564.tar.gz b/vim-8.2.2564.tar.gz new file mode 100644 index 0000000..039bf67 --- /dev/null +++ b/vim-8.2.2564.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d496070443c87a4d8fc8559585fbbb52640ff5302367091f1680c48118279d7 +size 15436035 diff --git a/vim-changelog.sh b/vim-changelog.sh index a4c41e4..788aa98 100644 --- a/vim-changelog.sh +++ b/vim-changelog.sh @@ -1,10 +1,15 @@ #!/usr/bin/env zsh -directory=http://ftp.vim.org/pub/vim/patches +directory=https://ftp.nluug.nl/pub/vim/patches/ version=8.2 +if [ $# -ne 2 ]; then + echo "usage: $0 " 1>&2 + exit 1 +fi + echo "Updated to version $version.$(echo $2 | sed 's/^*//'), fixes the following problems" -for i in $(seq $1 $2); do +for i in $(seq -w $1 $2); do curl $directory/$version/$version.$i -s | grep -v "Binary file (standard input) matches" | \ tr -d '\n' | grep -oP "Problem:.*Solution:" | sed s,"Problem: "," * ", | sed s,"Solution:",, | \ tr '\t' '\n' | sed s,' ','', | fmt -w 80 diff --git a/vim.changes b/vim.changes index 328f928..df6d6ed 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,54 @@ +------------------------------------------------------------------- +Wed Mar 3 19:04:23 UTC 2021 - Ondřej Súkup + +- Updated to version 8.2.2564, fixes the following problems + * Not all fields in "cstack" are initialized which might cause a crash. + * Crash when using :all while using a cmdline window. (Zdenek Dohnal) + * Using freed memory when closing the cmdline window. + * No way to check for the cmdwin feature, cmdline_hist is now always enabled. + * May get stuck in command line window state. + * Condition stack values may be used when not set. + * Color not changed if ModeMsg highlight is set in InsertEnter autocmd + event. (Paul Swanson) + * Autocmd test was failing on MS-Windows with GUI. + * Too many problems with using all autocommand events. + * Double free when using autocommand with "argdel". (Houyunsong) + * Crash when deleting with line number out of range. (Houyunsong) + * Missing error message. + * Some tests are known to cause an error with ASAN. + * Cursor on invalid line with range and :substitute. + * Allowing 'completefunc' to switch windows causes trouble. + * Can still switch windows for 'completefunc'. + * FocusGained does not work when 'ttymouse' is empty. + * :goto does not work correctly with text properties. (Sam McCall) + * :vimgrep expands wildcards twice. + * Warning for -fno-strength-reduce with Clang 11. + * Libvterm tests are executed even when libtool doesn't work. + * Opening cmdline window gives error in BufLeave autocommand. + * Vim9: no error when compiling str2nr() with a number. + * setline() gives an error for some types. + * Vim9 script test is a bit flaky. + * Deprecation warnings with default configuration. + * Out of bounds compiler warning. + +------------------------------------------------------------------- +Mon Mar 1 13:45:17 UTC 2021 - Matthias Gerstner + +- vim-changelog.sh: + * use https:// URL for authenticity. For this URL needs to be changed to + nluugl.nl which is the actual server behind this and the SSL certificate + only works for this URL. + * Check for number of arguments. + * Maintain leading zeroes in version arguments, otherwise things + like `vim-changelog.sh 0007 0010` fail to work. + +------------------------------------------------------------------- +Fri Feb 19 11:03:00 UTC 2021 - Ludwig Nussel + +- install suse vimrc in /usr (boo#1182324, vim-8.2.2411-globalvimrc.patch). + Add back some settings from defaults.vim that were in suse.vimrc before +- prevent double loading of spec.vim + ------------------------------------------------------------------- Thu Feb 18 16:44:25 UTC 2021 - Ludwig Nussel diff --git a/vim.spec b/vim.spec index 4e8fdce..5832a11 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 8.2 -%define patchlevel 2411 +%define patchlevel 2564 %define patchlevel_compact %{patchlevel} %define VIM_SUBDIR vim82 %define site_runtimepath %{_datadir}/vim/site @@ -71,6 +71,7 @@ Patch101: vim-8.0.1568-defaults.patch # https://github.com/vim/vim/issues/3348 - problem more probadly in buildenv than in test Patch102: vim-8.1.0297-dump3.patch Patch103: no-common.patch +Patch104: vim-8.2.2411-globalvimrc.patch BuildRequires: autoconf BuildRequires: db-devel BuildRequires: fdupes @@ -191,6 +192,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch101 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # Unreliable tests