From be9cc977ba09a0b85d9efaa19fe750e109266fbb4609e3c2aa71828c04992072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 24 Mar 2015 11:49:00 +0000 Subject: [PATCH 1/2] - Updated to revision 676, fixes the following problems * When 'ruler' is set the preferred column is reset. (Issue 339) * Using freed memory when g:colors_name is changed in the colors script. (oni-link) * Using "0 CTRL-D" in Insert mode may have CursorHoldI interfere. (Gary Johnson) * When 'M' is in the 'cpo' option then selecting a text object in parenthesis does not work correctly. * When using netbeans a buffer is not found in another tab. * When 'compatible' is reset 'numberwidth' is set to 4, but the effect doesn't show until a change is made. * 'linebreak' does not work properly with multi-byte characters. * There is a chance that Vim may lock up. * 'colorcolumn' isn't drawn in a closed fold while 'cursorcolumn' is. (Carlos Pita) * Can't use a glob pattern as a regexp pattern. * When netbeans is active the sign column always shows up. * Using 'cindent' for Javascript is less than perfect. * Warning for shadowing a variable. * When completing a shell command, directories in the current directory are not listed. * The first syntax entry gets sequence number zero, which doesn't work. (Clinton McKay) * Missing changes in one file. * When a FileReadPost autocommand moves the cursor inside a line it gets moved back. - Refresh vim73-no-static-libpython.patch OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=262 --- _service | 4 ++-- vim-7.4.658.hg.6667.tar.xz | 3 --- vim-7.4.676.hg.6704.tar.xz | 3 +++ vim.changes | 31 +++++++++++++++++++++++++++++++ vim.spec | 6 +++--- vim73-no-static-libpython.patch | 12 +++++++----- 6 files changed, 46 insertions(+), 13 deletions(-) delete mode 100644 vim-7.4.658.hg.6667.tar.xz create mode 100644 vim-7.4.676.hg.6704.tar.xz diff --git a/_service b/_service index 24520f3..d3e4358 100644 --- a/_service +++ b/_service @@ -3,8 +3,8 @@ hg https://code.google.com/p/vim vim - 7.4.658.hg - v7-4-658 + 7.4.676.hg + v7-4-676 xz diff --git a/vim-7.4.658.hg.6667.tar.xz b/vim-7.4.658.hg.6667.tar.xz deleted file mode 100644 index a81fcff..0000000 --- a/vim-7.4.658.hg.6667.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60d7aacd85390adc781ab821944089ce884a85d5776e909677bf9af52c288b39 -size 7791692 diff --git a/vim-7.4.676.hg.6704.tar.xz b/vim-7.4.676.hg.6704.tar.xz new file mode 100644 index 0000000..5d4cc3f --- /dev/null +++ b/vim-7.4.676.hg.6704.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b954eb1d6f6ed53861eacb34ed9b9696fd98c7aa9eead041834422178783f0f0 +size 7793516 diff --git a/vim.changes b/vim.changes index f613908..8ae40ff 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Tue Mar 24 11:37:52 UTC 2015 - idonmez@suse.com + +- Updated to revision 676, fixes the following problems + * When 'ruler' is set the preferred column is reset. (Issue 339) + * Using freed memory when g:colors_name is changed in the colors + script. (oni-link) + * Using "0 CTRL-D" in Insert mode may have CursorHoldI interfere. + (Gary Johnson) + * When 'M' is in the 'cpo' option then selecting a text object in + parenthesis does not work correctly. + * When using netbeans a buffer is not found in another tab. + * When 'compatible' is reset 'numberwidth' is set to 4, but the + effect doesn't show until a change is made. + * 'linebreak' does not work properly with multi-byte characters. + * There is a chance that Vim may lock up. + * 'colorcolumn' isn't drawn in a closed fold while 'cursorcolumn' + is. (Carlos Pita) + * Can't use a glob pattern as a regexp pattern. + * When netbeans is active the sign column always shows up. + * Using 'cindent' for Javascript is less than perfect. + * Warning for shadowing a variable. + * When completing a shell command, directories in the current + directory are not listed. + * The first syntax entry gets sequence number zero, which doesn't + work. (Clinton McKay) + * Missing changes in one file. + * When a FileReadPost autocommand moves the cursor inside a line it + gets moved back. +- Refresh vim73-no-static-libpython.patch + ------------------------------------------------------------------- Tue Mar 10 07:58:51 UTC 2015 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 33acbb5..4e8aba5 100644 --- a/vim.spec +++ b/vim.spec @@ -17,8 +17,8 @@ %define pkg_version 7.4 -%define patchlevel 658 -%define revision 6667 +%define patchlevel 676 +%define revision 6704 %define VIM_SUBDIR vim74 %define site_runtimepath /usr/share/vim/site %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags} @@ -173,7 +173,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch21 -p1 %patch22 -p1 %patch100 -p1 -%patch101 +%patch101 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . %build diff --git a/vim73-no-static-libpython.patch b/vim73-no-static-libpython.patch index 1819641..252b483 100644 --- a/vim73-no-static-libpython.patch +++ b/vim73-no-static-libpython.patch @@ -1,11 +1,13 @@ ---- src/configure.in.orig -+++ src/configure.in -@@ -881,7 +881,7 @@ eof +Index: vim-7.4.676.hg.6704/src/configure.in +=================================================================== +--- vim-7.4.676.hg.6704.orig/src/configure.in ++++ vim-7.4.676.hg.6704/src/configure.in +@@ -1143,7 +1143,7 @@ eof if test "${vi_cv_var_python_version}" = "1.4"; then vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" else - vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" + vi_cv_path_python_plibs="-lpython${vi_cv_var_python_version}" fi - vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" - dnl remove -ltermcap, it can conflict with an earlier -lncurses + dnl -- Check if the path contained in python_LINKFORSHARED is + dnl usable for vim build. If not, make and try other From 84b68f9040a78efd75d3cab9962ff7cd09787a301b89763cb64e6e32c8533bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 26 Mar 2015 09:24:08 +0000 Subject: [PATCH 2/2] - Updated to revision 683, fixes the following problems * When using --remote the directory may end up being wrong. * CTRL-W in Insert mode does not work well for multi-byte characters. * MS-Windows: When Vim is minimized the window height is computed incorrectly. * The search highlighting and match highlighting replaces the cursorline highlighting, this doesn't look good. * Typo in the vimtutor command. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=263 --- _service | 13 ------------- v7-4-683.tar.gz | 3 +++ vim-7.4.676.hg.6704.tar.xz | 3 --- vim.changes | 13 +++++++++++++ vim.spec | 10 +++++----- 5 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 _service create mode 100644 v7-4-683.tar.gz delete mode 100644 vim-7.4.676.hg.6704.tar.xz diff --git a/_service b/_service deleted file mode 100644 index d3e4358..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - hg - https://code.google.com/p/vim - vim - 7.4.676.hg - v7-4-676 - - - xz - vim*.tar - - diff --git a/v7-4-683.tar.gz b/v7-4-683.tar.gz new file mode 100644 index 0000000..9f05b1a --- /dev/null +++ b/v7-4-683.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:859c849ca93cb7da0cdfe302e5decdd266e9c014229235dd699fb7175ad80b00 +size 12160350 diff --git a/vim-7.4.676.hg.6704.tar.xz b/vim-7.4.676.hg.6704.tar.xz deleted file mode 100644 index 5d4cc3f..0000000 --- a/vim-7.4.676.hg.6704.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b954eb1d6f6ed53861eacb34ed9b9696fd98c7aa9eead041834422178783f0f0 -size 7793516 diff --git a/vim.changes b/vim.changes index 8ae40ff..2391351 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Mar 26 09:16:27 UTC 2015 - idonmez@suse.com + +- Updated to revision 683, fixes the following problems + * When using --remote the directory may end up being wrong. + * CTRL-W in Insert mode does not work well for multi-byte + characters. + * MS-Windows: When Vim is minimized the window height is computed + incorrectly. + * The search highlighting and match highlighting replaces the + cursorline highlighting, this doesn't look good. + * Typo in the vimtutor command. + ------------------------------------------------------------------- Tue Mar 24 11:37:52 UTC 2015 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 4e8aba5..b6107a8 100644 --- a/vim.spec +++ b/vim.spec @@ -17,14 +17,14 @@ %define pkg_version 7.4 -%define patchlevel 676 -%define revision 6704 +%define patchlevel 683 +%define _rversion 7-4-%patchlevel %define VIM_SUBDIR vim74 %define site_runtimepath /usr/share/vim/site %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags} Name: vim -Version: 7.4.%{patchlevel}.hg.%{revision} +Version: 7.4.%{patchlevel} Release: 0 BuildRequires: autoconf BuildRequires: db-devel @@ -63,7 +63,7 @@ Summary: Vi IMproved License: Vim Group: Productivity/Editors/Vi Url: http://www.vim.org/ -Source: vim-%{version}.tar.xz +Source: https://github.com/vim/vim/archive/v%{_rversion}.tar.gz Source3: suse.vimrc Source4: vimrc_example1 Source5: vimrc_example2 @@ -155,7 +155,7 @@ You need package vim for the help and other documentation too. If you want less features, you might want to install vim instead. %prep -%setup -q +%setup -q -n %{name}-%{_rversion} %patch3 -p1 %patch4 -p1