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
This commit is contained in:
Git OBS Bridge
parent
0f0953e625
commit
e01c9b8504
36
suse.vimrc
36
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 <ESC>[G i
|
||||
endif
|
||||
|
||||
if myterm == "screen"
|
||||
map! <ESC>[1;2D <S-Left>
|
||||
map! <ESC>[1;2C <S-Right>
|
||||
map! <ESC>[1;2A <S-Up>
|
||||
map! <ESC>[1;2B <S-Down>
|
||||
map! <ESC>[1;2H <Home>
|
||||
map! <ESC>[1;2F <End>
|
||||
map! <ESC>[2;2~ <Insert>
|
||||
map! <ESC>[3;2~ <Delete>
|
||||
map! <ESC>[5;2~ <PageUp>
|
||||
map! <ESC>[6;2~ <PageDown>
|
||||
map! <ESC>[1;5D <C-Left>
|
||||
map! <ESC>[1;5C <C-Right>
|
||||
map! <ESC>[1;5A <C-Up>
|
||||
map! <ESC>[1;5B <C-Down>
|
||||
map! <ESC>[1;5H <Home>
|
||||
map! <ESC>[1;5F <End>
|
||||
map! <ESC>[2;5~ <Insert>
|
||||
map! <ESC>[3;5~ <Delete>
|
||||
map! <ESC>[5;5~ <PageUp>
|
||||
map! <ESC>[6;5~ <PageDown>
|
||||
map! <ESC>[1;3D <A-Left>
|
||||
map! <ESC>[1;3C <A-Right>
|
||||
map! <ESC>[1;3A <A-Up>
|
||||
map! <ESC>[1;3B <A-Down>
|
||||
map! <ESC>[1;3H <Home>
|
||||
map! <ESC>[1;3F <End>
|
||||
map! <ESC>[2;3~ <Insert>
|
||||
map! <ESC>[3;3~ <Delete>
|
||||
map! <ESC>[5;3~ <PageUp>
|
||||
map! <ESC>[6;3~ <PageDown>
|
||||
endif
|
||||
|
||||
" This escape sequence is the well known ANSI sequence for
|
||||
" Remove Character Under The Cursor (RCUTC[tm])
|
||||
map! <Esc>[3~ <Delete>
|
||||
|
||||
12
vim.changes
12
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
|
||||
|
||||
|
||||
20
vim.spec
20
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}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user