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
This commit is contained in:
OBS User autobuild 2010-08-30 10:16:40 +00:00 committed by Git OBS Bridge
parent e01c9b8504
commit 1f72eded4c
2 changed files with 6 additions and 17 deletions

View File

@ -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

View File

@ -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}