From 9f8096aedf8a48b40a322c48e509a046d0c363a4e5b27e396e88f6b1a1d13895 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 27 Apr 2010 10:09:31 +0000 Subject: [PATCH 1/5] . OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=16 --- suse.vimrc | 36 ++++++++++++++++++++++++++++++++++++ vim.changes | 5 +++++ 2 files changed, 41 insertions(+) diff --git a/suse.vimrc b/suse.vimrc index 89e0796..8ad242d 100644 --- a/suse.vimrc +++ b/suse.vimrc @@ -44,10 +44,13 @@ set backspace=indent,eol,start " Try to get the correct main terminal type if &term =~ "xterm" let myterm = "xterm" +elseif &term =~ "screen" + let myterm = "screen" else let myterm = &term endif let myterm = substitute(myterm, "cons[0-9][0-9].*$", "linux", "") +let myterm = substitute(myterm, "cons[0-9][0-9].*$", "linux", "") let myterm = substitute(myterm, "vt1[0-9][0-9].*$", "vt100", "") let myterm = substitute(myterm, "vt2[0-9][0-9].*$", "vt220", "") let myterm = substitute(myterm, "\\([^-]*\\)[_-].*$", "\\1", "") @@ -191,6 +194,39 @@ if myterm == "linux" map [G i endif +if myterm == "screen" + map! [1;2D + map! [1;2C + map! [1;2A + map! [1;2B + map! [1;2H + map! [1;2F + map! [2;2~ + map! [3;2~ + map! [5;2~ + map! [6;2~ + map! [1;5D + map! [1;5C + map! [1;5A + map! [1;5B + map! [1;5H + map! [1;5F + map! [2;5~ + map! [3;5~ + map! [5;5~ + map! [6;5~ + map! [1;3D + map! [1;3C + map! [1;3A + map! [1;3B + map! [1;3H + map! [1;3F + map! [2;3~ + map! [3;3~ + map! [5;3~ + map! [6;3~ +endif + " This escape sequence is the well known ANSI sequence for " Remove Character Under The Cursor (RCUTC[tm]) map! [3~ diff --git a/vim.changes b/vim.changes index 6bae357..c70143b 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 27 12:06:07 CEST 2010 - werner@suse.de + +- Add screen control sequences to inputrc (bnc#598903) + ------------------------------------------------------------------- Sat Mar 27 11:48:28 CET 2010 - vuntz@opensuse.org From 0f0953e6259de0fe1c327cb4c8cf12b6c3955a5fa4d1a5fcdcf3c63de6df0d06 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 27 Apr 2010 13:02:41 +0000 Subject: [PATCH 2/5] Accepting request 38927 from editors checked in (request 38927) OBS-URL: https://build.opensuse.org/request/show/38927 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=17 --- suse.vimrc | 36 ------------------------------------ vim.changes | 5 ----- 2 files changed, 41 deletions(-) diff --git a/suse.vimrc b/suse.vimrc index 8ad242d..89e0796 100644 --- a/suse.vimrc +++ b/suse.vimrc @@ -44,13 +44,10 @@ set backspace=indent,eol,start " Try to get the correct main terminal type if &term =~ "xterm" let myterm = "xterm" -elseif &term =~ "screen" - let myterm = "screen" else let myterm = &term endif let myterm = substitute(myterm, "cons[0-9][0-9].*$", "linux", "") -let myterm = substitute(myterm, "cons[0-9][0-9].*$", "linux", "") let myterm = substitute(myterm, "vt1[0-9][0-9].*$", "vt100", "") let myterm = substitute(myterm, "vt2[0-9][0-9].*$", "vt220", "") let myterm = substitute(myterm, "\\([^-]*\\)[_-].*$", "\\1", "") @@ -194,39 +191,6 @@ if myterm == "linux" map [G i endif -if myterm == "screen" - map! [1;2D - map! [1;2C - map! [1;2A - map! [1;2B - map! [1;2H - map! [1;2F - map! [2;2~ - map! [3;2~ - map! [5;2~ - map! [6;2~ - map! [1;5D - map! [1;5C - map! [1;5A - map! [1;5B - map! [1;5H - map! [1;5F - map! [2;5~ - map! [3;5~ - map! [5;5~ - map! [6;5~ - map! [1;3D - map! [1;3C - map! [1;3A - map! [1;3B - map! [1;3H - map! [1;3F - map! [2;3~ - map! [3;3~ - map! [5;3~ - map! [6;3~ -endif - " This escape sequence is the well known ANSI sequence for " Remove Character Under The Cursor (RCUTC[tm]) map! [3~ diff --git a/vim.changes b/vim.changes index c70143b..6bae357 100644 --- a/vim.changes +++ b/vim.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Apr 27 12:06:07 CEST 2010 - werner@suse.de - -- Add screen control sequences to inputrc (bnc#598903) - ------------------------------------------------------------------- Sat Mar 27 11:48:28 CET 2010 - vuntz@opensuse.org From e01c9b8504fa08a0a6c662257fb49e7c4462244c89429521f8144976322fa12b Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 27 Aug 2010 10:00:42 +0000 Subject: [PATCH 3/5] Accepting request 46386 from home:a_jaeger:branches:build-compare-test Copy from home:a_jaeger:branches:build-compare-test/vim via accept of submit request 46386 revision 3. Request was accepted with message: reviewed ok OBS-URL: https://build.opensuse.org/request/show/46386 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=18 --- suse.vimrc | 36 ++++++++++++++++++++++++++++++++++++ vim.changes | 12 ++++++++++++ vim.spec | 20 ++++++++++++-------- 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/suse.vimrc b/suse.vimrc index 89e0796..8ad242d 100644 --- a/suse.vimrc +++ b/suse.vimrc @@ -44,10 +44,13 @@ set backspace=indent,eol,start " Try to get the correct main terminal type if &term =~ "xterm" let myterm = "xterm" +elseif &term =~ "screen" + let myterm = "screen" else let myterm = &term endif let myterm = substitute(myterm, "cons[0-9][0-9].*$", "linux", "") +let myterm = substitute(myterm, "cons[0-9][0-9].*$", "linux", "") let myterm = substitute(myterm, "vt1[0-9][0-9].*$", "vt100", "") let myterm = substitute(myterm, "vt2[0-9][0-9].*$", "vt220", "") let myterm = substitute(myterm, "\\([^-]*\\)[_-].*$", "\\1", "") @@ -191,6 +194,39 @@ if myterm == "linux" map [G i endif +if myterm == "screen" + map! [1;2D + map! [1;2C + map! [1;2A + map! [1;2B + map! [1;2H + map! [1;2F + map! [2;2~ + map! [3;2~ + map! [5;2~ + map! [6;2~ + map! [1;5D + map! [1;5C + map! [1;5A + map! [1;5B + map! [1;5H + map! [1;5F + map! [2;5~ + map! [3;5~ + map! [5;5~ + map! [6;5~ + map! [1;3D + map! [1;3C + map! [1;3A + map! [1;3B + map! [1;3H + map! [1;3F + map! [2;3~ + map! [3;3~ + map! [5;3~ + map! [6;3~ +endif + " This escape sequence is the well known ANSI sequence for " Remove Character Under The Cursor (RCUTC[tm]) map! [3~ diff --git a/vim.changes b/vim.changes index 6bae357..b5634f3 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Aug 27 07:17:53 UTC 2010 - aj@suse.de + +- Fix rpmlint warnings about duplicate files. +- Remove now obsolete option --with-xusetheXWindowSystem. +- Do not record build time in binary + +------------------------------------------------------------------- +Tue Apr 27 12:06:07 CEST 2010 - werner@suse.de + +- Add screen control sequences to inputrc (bnc#598903) + ------------------------------------------------------------------- Sat Mar 27 11:48:28 CET 2010 - vuntz@opensuse.org diff --git a/vim.spec b/vim.spec index 027c96b..4571197 100644 --- a/vim.spec +++ b/vim.spec @@ -20,9 +20,9 @@ Name: vim Version: 7.2 -Release: 18 +Release: 19 # -License: Other uncritical OpenSource License ; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license +License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi # BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -113,7 +113,7 @@ file name completion, block operations, and editing of binary data. Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions of UNIX. -For SuSE Linux, Vim is used as /usr/bin/vi. +For SUSE Linux, Vim is used as /usr/bin/vi. Package vim contains the normal version of vim. To get the full runtime environment install additionally vim-data. @@ -144,7 +144,7 @@ file name completion, block operations, and editing of binary data. Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions of UNIX. -For SuSE Linux, Vim is used as /usr/bin/vi. +For SUSE Linux, Vim is used as /usr/bin/vi. Package vim-data contains the runtime files. @@ -172,7 +172,7 @@ file name completion, block operations, and editing of binary data. Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions of UNIX. -For SuSE Linux, Vim is used as /usr/bin/vi. +For SUSE Linux, Vim is used as /usr/bin/vi. Package vim-base contains the common files needed for all different vim versions. You still need to select at least one of the vim, @@ -272,8 +272,6 @@ Requires: %{perl_requires} Summary: A GUI for Vi %description -n gvim -Start: /usr/X11R6/bin/gvim - Copy and modify /usr/share/vim/current/gvimrc to ~/.gvimrc if needed. Package gvim contains the largest set of features of vim, which is @@ -352,7 +350,6 @@ export GUI_OPTIONS="\ --enable-xim \ --enable-fontset \ --enable-gnome-check \ - --with-xusetheXWindowSystem \ --enable-gui=gnome2 \ --enable-gtk2-check \ --with-gtk-prefix=/opt/gnome \ @@ -363,18 +360,21 @@ export GUI_OPTIONS="\ ${COMMON_OPTIONS} --disable-gui --without-x --disable-gpm \ --disable-perlinterp --disable-pythoninterp \ --disable-rubyinterp --disable-tclinterp +sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %make %{__cp} src/vim vim-normal %{__make} distclean # # build enhanced binary %configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} --disable-gui +sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %make %{__cp} src/vim vim-enhanced %{__make} distclean # # build enhanced gvim binary %configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} ${GUI_OPTIONS} +sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %if 0%{?with_splitted_gvim} %make %{__cp} src/vim gvim-enhanced @@ -382,6 +382,7 @@ export GUI_OPTIONS="\ # # build gvim binary %configure ${COMMON_OPTIONS} ${GUI_OPTIONS} +sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %endif %make # @@ -477,6 +478,9 @@ rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/*.c rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c # %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang +%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tutor +%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/ftplugin + %clean %{__rm} -rf %{buildroot} From 1f72eded4ce60b692846109e4a73ee027e976bdac73719a8586f66c3c2d3b405 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 30 Aug 2010 10:16:40 +0000 Subject: [PATCH 4/5] Accepting request 46630 from editors checked in (request 46630) OBS-URL: https://build.opensuse.org/request/show/46630 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=19 --- vim.changes | 7 ------- vim.spec | 16 ++++++---------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/vim.changes b/vim.changes index b5634f3..c70143b 100644 --- a/vim.changes +++ b/vim.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Fri Aug 27 07:17:53 UTC 2010 - aj@suse.de - -- Fix rpmlint warnings about duplicate files. -- Remove now obsolete option --with-xusetheXWindowSystem. -- Do not record build time in binary - ------------------------------------------------------------------- Tue Apr 27 12:06:07 CEST 2010 - werner@suse.de diff --git a/vim.spec b/vim.spec index 4571197..cb040ac 100644 --- a/vim.spec +++ b/vim.spec @@ -113,7 +113,7 @@ file name completion, block operations, and editing of binary data. Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions of UNIX. -For SUSE Linux, Vim is used as /usr/bin/vi. +For SuSE Linux, Vim is used as /usr/bin/vi. Package vim contains the normal version of vim. To get the full runtime environment install additionally vim-data. @@ -144,7 +144,7 @@ file name completion, block operations, and editing of binary data. Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions of UNIX. -For SUSE Linux, Vim is used as /usr/bin/vi. +For SuSE Linux, Vim is used as /usr/bin/vi. Package vim-data contains the runtime files. @@ -172,7 +172,7 @@ file name completion, block operations, and editing of binary data. Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions of UNIX. -For SUSE Linux, Vim is used as /usr/bin/vi. +For SuSE Linux, Vim is used as /usr/bin/vi. Package vim-base contains the common files needed for all different vim versions. You still need to select at least one of the vim, @@ -272,6 +272,8 @@ Requires: %{perl_requires} Summary: A GUI for Vi %description -n gvim +Start: /usr/X11R6/bin/gvim + Copy and modify /usr/share/vim/current/gvimrc to ~/.gvimrc if needed. Package gvim contains the largest set of features of vim, which is @@ -350,6 +352,7 @@ export GUI_OPTIONS="\ --enable-xim \ --enable-fontset \ --enable-gnome-check \ + --with-xusetheXWindowSystem \ --enable-gui=gnome2 \ --enable-gtk2-check \ --with-gtk-prefix=/opt/gnome \ @@ -360,21 +363,18 @@ export GUI_OPTIONS="\ ${COMMON_OPTIONS} --disable-gui --without-x --disable-gpm \ --disable-perlinterp --disable-pythoninterp \ --disable-rubyinterp --disable-tclinterp -sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %make %{__cp} src/vim vim-normal %{__make} distclean # # build enhanced binary %configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} --disable-gui -sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %make %{__cp} src/vim vim-enhanced %{__make} distclean # # build enhanced gvim binary %configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} ${GUI_OPTIONS} -sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %if 0%{?with_splitted_gvim} %make %{__cp} src/vim gvim-enhanced @@ -382,7 +382,6 @@ sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h # # build gvim binary %configure ${COMMON_OPTIONS} ${GUI_OPTIONS} -sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %endif %make # @@ -478,9 +477,6 @@ rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/*.c rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c # %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang -%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tutor -%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/ftplugin - %clean %{__rm} -rf %{buildroot} From 30f55d5b262b4a0829ab85f3b25e9f9fc9ac8b938e44e3efa6d2498c7747fcb4 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 30 Aug 2010 10:16:42 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/vim revision 47.0 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=d0b1c0404d9f87c8b5bfa82751ee94be --- vim.changes | 7 +++++++ vim.spec | 17 ++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/vim.changes b/vim.changes index c70143b..b5634f3 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Aug 27 07:17:53 UTC 2010 - aj@suse.de + +- Fix rpmlint warnings about duplicate files. +- Remove now obsolete option --with-xusetheXWindowSystem. +- Do not record build time in binary + ------------------------------------------------------------------- Tue Apr 27 12:06:07 CEST 2010 - werner@suse.de diff --git a/vim.spec b/vim.spec index cb040ac..9957406 100644 --- a/vim.spec +++ b/vim.spec @@ -20,7 +20,7 @@ Name: vim Version: 7.2 -Release: 19 +Release: 26 # License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi @@ -113,7 +113,7 @@ file name completion, block operations, and editing of binary data. Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions of UNIX. -For SuSE Linux, Vim is used as /usr/bin/vi. +For SUSE Linux, Vim is used as /usr/bin/vi. Package vim contains the normal version of vim. To get the full runtime environment install additionally vim-data. @@ -144,7 +144,7 @@ file name completion, block operations, and editing of binary data. Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions of UNIX. -For SuSE Linux, Vim is used as /usr/bin/vi. +For SUSE Linux, Vim is used as /usr/bin/vi. Package vim-data contains the runtime files. @@ -172,7 +172,7 @@ file name completion, block operations, and editing of binary data. Vi is available for the AMIGA, MS-DOS, Windows NT, and various versions of UNIX. -For SuSE Linux, Vim is used as /usr/bin/vi. +For SUSE Linux, Vim is used as /usr/bin/vi. Package vim-base contains the common files needed for all different vim versions. You still need to select at least one of the vim, @@ -272,8 +272,6 @@ Requires: %{perl_requires} Summary: A GUI for Vi %description -n gvim -Start: /usr/X11R6/bin/gvim - Copy and modify /usr/share/vim/current/gvimrc to ~/.gvimrc if needed. Package gvim contains the largest set of features of vim, which is @@ -352,7 +350,6 @@ export GUI_OPTIONS="\ --enable-xim \ --enable-fontset \ --enable-gnome-check \ - --with-xusetheXWindowSystem \ --enable-gui=gnome2 \ --enable-gtk2-check \ --with-gtk-prefix=/opt/gnome \ @@ -363,18 +360,21 @@ export GUI_OPTIONS="\ ${COMMON_OPTIONS} --disable-gui --without-x --disable-gpm \ --disable-perlinterp --disable-pythoninterp \ --disable-rubyinterp --disable-tclinterp +sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %make %{__cp} src/vim vim-normal %{__make} distclean # # build enhanced binary %configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} --disable-gui +sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %make %{__cp} src/vim vim-enhanced %{__make} distclean # # build enhanced gvim binary %configure ${COMMON_OPTIONS} ${SCRIPT_OPTIONS} ${GUI_OPTIONS} +sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %if 0%{?with_splitted_gvim} %make %{__cp} src/vim gvim-enhanced @@ -382,6 +382,7 @@ export GUI_OPTIONS="\ # # build gvim binary %configure ${COMMON_OPTIONS} ${GUI_OPTIONS} +sed -i -e 's|define HAVE_DATE_TIME 1|undef HAVE_DATE_TIME|' src/auto/config.h %endif %make # @@ -477,6 +478,8 @@ rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tools/*.c rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/macros/maze/*.c # %fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/lang +%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/tutor +%fdupes -s %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/ftplugin %clean %{__rm} -rf %{buildroot}