From 0c332ead23cbb84b8cf0c31c8be4a4e189df5de9d55e228bd7af2443ee4a3c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 25 Aug 2014 11:50:01 +0000 Subject: [PATCH 1/4] - Use mercurial tags instead of applying patches one by one. This reduces unexpected failures. - Updated to revision 417, fixes the following problems * Can't build with Perl on Fedora 20. * Fold does not open after search when there is a CmdwinLeave autocommand. * "foo bar" sorts before "foo" with sort(). (John Little) * Cannot define a command only when it's used. * Cannot build. Warning for shadowed variable. (John Little) * Problem with breakindent/showbreak and tabs. * After splitting a window and setting 'breakindent' the default minimum with is not respected. * Screen updating is slow when using matches. * Inserting text for Visual block mode, with cursor movement, repeats the wrong text. (Aleksandar Ivanov) * Visual block insert breaks a multi-byte character. * Compiler warning for unused argument and unused variable. * Character after "fb" command not mapped if it might be a composing character. * Test 63 fails when run with GUI-only Vim. * Popup menu flickers too much. * When 'equalalways' is set a split may report "no room" even though there is plenty of room. * Title of quickfist list is not kept for setqflist(list, 'r'). * Accessing freed memory after using setqflist(list, 'r'). (Lcd) * Loading python may cause Vim to exit. * Get u_undo error when backspacing in Insert mode deletes more than one line break. (Ayberk Ozgur) * Mapping characters may not work after typing Esc in Insert mode. * Bad interaction between preview window and omnifunc. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=224 --- vim-7.3-filetype_spec.patch | 24 +++++++++-------- vim-7.4-patches.tar.bz2 | 3 --- vim-7.4.417.tar.bz2 | 3 +++ vim-7.4.tar.bz2 | 3 --- vim.changes | 54 +++++++++++++++++++++++++++++++++++++ vim.spec | 15 +++-------- 6 files changed, 74 insertions(+), 28 deletions(-) delete mode 100644 vim-7.4-patches.tar.bz2 create mode 100644 vim-7.4.417.tar.bz2 delete mode 100644 vim-7.4.tar.bz2 diff --git a/vim-7.3-filetype_spec.patch b/vim-7.3-filetype_spec.patch index 00d37b0..eda3146 100644 --- a/vim-7.3-filetype_spec.patch +++ b/vim-7.3-filetype_spec.patch @@ -1,7 +1,8 @@ -diff -rup vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim ---- vim73.orig/runtime/filetype.vim 2010-08-03 22:44:00.000000000 +0200 -+++ vim73/runtime/filetype.vim 2010-11-21 05:57:07.132983365 +0100 -@@ -1897,7 +1897,7 @@ endfunc +Index: vim/runtime/filetype.vim +=================================================================== +--- vim.orig/runtime/filetype.vim ++++ vim/runtime/filetype.vim +@@ -2038,7 +2038,7 @@ endfunc " Spec (Linux RPM) @@ -10,10 +11,11 @@ diff -rup vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim " Speedup (AspenTech plant simulator) au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup -diff -rup vim73.orig/runtime/syntax/spec.vim vim73/runtime/syntax/spec.vim ---- vim73.orig/runtime/syntax/spec.vim 2010-05-15 13:03:57.000000000 +0200 -+++ vim73/runtime/syntax/spec.vim 2010-11-21 05:57:07.130970392 +0100 -@@ -104,7 +104,7 @@ syn case ignore +Index: vim/runtime/syntax/spec.vim +=================================================================== +--- vim.orig/runtime/syntax/spec.vim ++++ vim/runtime/syntax/spec.vim +@@ -105,7 +105,7 @@ syn case ignore "%% PreAmble Section %% "Copyright and Serial were deprecated by License and Epoch syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier @@ -22,12 +24,12 @@ diff -rup vim73.orig/runtime/syntax/spec.vim vim73/runtime/syntax/spec.vim "%% Description Section %% syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment -@@ -113,7 +113,7 @@ syn region specDescriptionArea matchgrou +@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment "%% Scripts Section %% --syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 -+syn region specScriptArea matchgroup=specSection start='^%\(prep\|check\|build\|install\|clean\|pre\|postun\|preun\|post\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 +-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 ++syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|check\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 "%% Changelog Section %% syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense diff --git a/vim-7.4-patches.tar.bz2 b/vim-7.4-patches.tar.bz2 deleted file mode 100644 index 361430d..0000000 --- a/vim-7.4-patches.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:725d37d7c5e7976d79ced34d823789791e2e6af97b6c1fc0afc98e60402f6d6c -size 390010 diff --git a/vim-7.4.417.tar.bz2 b/vim-7.4.417.tar.bz2 new file mode 100644 index 0000000..eb7d413 --- /dev/null +++ b/vim-7.4.417.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d2668a9d8f2b681565ac4351f9158e89a3de58fb5187d80b5600a2fde9ab186 +size 9944130 diff --git a/vim-7.4.tar.bz2 b/vim-7.4.tar.bz2 deleted file mode 100644 index d78ba06..0000000 --- a/vim-7.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade -size 9843297 diff --git a/vim.changes b/vim.changes index a8aa97a..4f43c89 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,57 @@ +------------------------------------------------------------------- +Mon Aug 25 11:05:19 UTC 2014 - idonmez@suse.com + +- Use mercurial tags instead of applying patches one by one. This + reduces unexpected failures. +- Updated to revision 417, fixes the following problems + * Can't build with Perl on Fedora 20. + * Fold does not open after search when there is a CmdwinLeave + autocommand. + * "foo bar" sorts before "foo" with sort(). (John Little) + * Cannot define a command only when it's used. + * Cannot build. Warning for shadowed variable. (John Little) + * Problem with breakindent/showbreak and tabs. + * After splitting a window and setting 'breakindent' the default + minimum with is not respected. + * Screen updating is slow when using matches. + * Inserting text for Visual block mode, with cursor movement, + repeats the wrong text. (Aleksandar Ivanov) + * Visual block insert breaks a multi-byte character. + * Compiler warning for unused argument and unused variable. + * Character after "fb" command not mapped if it might be a composing + character. + * Test 63 fails when run with GUI-only Vim. + * Popup menu flickers too much. + * When 'equalalways' is set a split may report "no room" even though + there is plenty of room. + * Title of quickfist list is not kept for setqflist(list, 'r'). + * Accessing freed memory after using setqflist(list, 'r'). (Lcd) + * Loading python may cause Vim to exit. + * Get u_undo error when backspacing in Insert mode deletes more than + one line break. (Ayberk Ozgur) + * Mapping characters may not work after typing Esc in Insert mode. + * Bad interaction between preview window and omnifunc. + * Test 102 fails when compiled with small features. + * When building with tiny or small features building the .mo files + fails. + * When splitting a window the changelist position is wrong. + * "4gro" replaces one character then executes "ooo". (Urtica Dioica) + * With 'linebreak' set and 'list' unset a Tab is not counted + properly. (Kent Sibilev) + * Still sometimes Vim enters Replace mode when starting up. + * Advancing pointer over end of a string. + * No 'cursorline' highlighting when the cursor is on a line with + diff highlighting. (Benjamin Fritz) + * Not easy to detect type of command line window. + * C indent is wrong below an if with wrapped condition followed by + curly braces. (Trevor Powell) + * When 'clipboard' is "unnamed", :g/pat/d is very slow. (Praful) + * Matchparen only uses the topmost syntax item. + * Encryption implementation is messy. Blowfish encryption has a + weakness. + * Test 72 crashes under certain conditions. (Kazunobu Kuriyama) + * Valgrind reports errors when running test 72. (Dominique Pelle) + ------------------------------------------------------------------- Tue Jul 22 09:04:57 UTC 2014 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index e442e7d..071fd9b 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 7.4 -%define official_ptchlvl 373 +%define official_ptchlvl 417 %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} @@ -73,7 +73,7 @@ License: SUSE-Vim Group: Productivity/Editors/Vi # Url: http://www.vim.org/ -Source: ftp://ftp.vim.org/pub/vim/unix/vim-%{pkg_version}.tar.bz2 +Source: vim-%{version}.tar.bz2 Source3: suse.vimrc Source4: vimrc_example1 Source5: vimrc_example2 @@ -86,7 +86,6 @@ Source18: missing-vim-client Source19: gvim.desktop Source20: spec.skeleton Source23: apparmor.vim -Source98: %{name}-7.4-patches.tar.bz2 Source99: %{name}-7.4-rpmlintrc Patch3: %{name}-7.4-disable_lang_no.patch Patch4: %{name}-7.3-gvimrc_fontset.patch @@ -167,14 +166,8 @@ 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 -n %{VIM_SUBDIR} -b 98 -for p in ../vim-%{pkg_version}-patches/%{pkg_version}*; do - test -e $p || break - test ${p#*/%{pkg_version}.} -le %{official_ptchlvl} || exit 1 - echo Patch $p - patch -s -p0 < $p -done -unset p +%setup -q -n vim + %patch3 -p1 %patch4 -p1 %patch5 -p1 From 863006a63ca10a56dbfda6adf7a326029e5cda25620dcf53b598f0001708fd50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 27 Aug 2014 12:25:24 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=225 --- _service | 13 +++++++++++++ vim-7.4.417.hg.6162.tar.xz | 3 +++ vim-7.4.417.tar.bz2 | 3 --- vim.spec | 14 +++++--------- 4 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 _service create mode 100644 vim-7.4.417.hg.6162.tar.xz delete mode 100644 vim-7.4.417.tar.bz2 diff --git a/_service b/_service new file mode 100644 index 0000000..2abdb94 --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + hg + https://code.google.com/p/vim/ + vim + 7.4.417.hg + v7-4-417 + + + xz + vim*.tar + + diff --git a/vim-7.4.417.hg.6162.tar.xz b/vim-7.4.417.hg.6162.tar.xz new file mode 100644 index 0000000..180736d --- /dev/null +++ b/vim-7.4.417.hg.6162.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed397439890e2be12ce7c5ace616f6de4cb935422666562232e6ae96e9310001 +size 7799164 diff --git a/vim-7.4.417.tar.bz2 b/vim-7.4.417.tar.bz2 deleted file mode 100644 index eb7d413..0000000 --- a/vim-7.4.417.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d2668a9d8f2b681565ac4351f9158e89a3de58fb5187d80b5600a2fde9ab186 -size 9944130 diff --git a/vim.spec b/vim.spec index 071fd9b..c27373b 100644 --- a/vim.spec +++ b/vim.spec @@ -17,13 +17,14 @@ %define pkg_version 7.4 -%define official_ptchlvl 417 +%define patchlevel 417 +%define revision 6162 %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.%{official_ptchlvl} +Version: 7.4.%{patchlevel}.hg.%{revision} Release: 0 BuildRequires: db-devel %if 0%{?suse_version} > 1020 @@ -73,7 +74,7 @@ License: SUSE-Vim Group: Productivity/Editors/Vi # Url: http://www.vim.org/ -Source: vim-%{version}.tar.bz2 +Source: vim-%{version}.tar.xz Source3: suse.vimrc Source4: vimrc_example1 Source5: vimrc_example2 @@ -166,7 +167,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 -n vim +%setup -q %patch3 -p1 %patch4 -p1 @@ -187,11 +188,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch101 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . -# newer perl? ugly hack to fix build anyway. -%if 0%{?suse_version} > 1210 -sed -i -e 's/^XS(XS_/XS_INTERNAL(XS_/' src/if_perl.xs -%endif - %build export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing" export CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/-D_FORTIFY_SOURCE=1} From f611ac2a73a86ea9fc8eac60ee4b79a9c97fcdbd91a671c8b40e6ff2ce27c27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 27 Aug 2014 12:33:13 +0000 Subject: [PATCH 3/4] - Use a disabled _service file - Remove the un-needed Perl hack in the spec file OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=226 --- vim.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vim.changes b/vim.changes index 4f43c89..a950157 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 27 12:29:19 UTC 2014 - idonmez@suse.com + +- Use a disabled _service file +- Remove the un-needed Perl hack in the spec file + ------------------------------------------------------------------- Mon Aug 25 11:05:19 UTC 2014 - idonmez@suse.com From ebc0ada02dbab3847e95e5648ecf274a1592e4071a08c598507ca599f66a4ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 29 Aug 2014 09:48:28 +0000 Subject: [PATCH 4/4] Accepting request 246788 from home:coolo:branches:openSUSE:Factory - fix license for spdx 1.2 OBS-URL: https://build.opensuse.org/request/show/246788 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=227 --- vim.changes | 5 +++++ vim.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/vim.changes b/vim.changes index a950157..4022a97 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 29 08:01:50 UTC 2014 - coolo@suse.com + +- fix license for spdx 1.2 + ------------------------------------------------------------------- Wed Aug 27 12:29:19 UTC 2014 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index c27373b..dd67156 100644 --- a/vim.spec +++ b/vim.spec @@ -70,7 +70,7 @@ Provides: vim_client Recommends: vim-data = %{version}-%{release} %endif Summary: Vi IMproved -License: SUSE-Vim +License: Vim Group: Productivity/Editors/Vi # Url: http://www.vim.org/