OBS User unknown 2007-01-24 17:47:53 +00:00 committed by Git OBS Bridge
parent d931fd5c11
commit a6a361b09d
2 changed files with 36 additions and 33 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 24 16:53:04 CET 2007 - mkoenig@suse.de
- move gvim and related stuff from /usr/X11R6/bin to /usr/bin
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 23 17:43:33 CET 2007 - mkoenig@suse.de Tue Jan 23 17:43:33 CET 2007 - mkoenig@suse.de

View File

@ -18,7 +18,7 @@ Group: Productivity/Editors/Vi
Provides: vi_clone Provides: vi_clone
Autoreqprov: on Autoreqprov: on
Version: 7.0 Version: 7.0
Release: 47 Release: 48
%define VIM_SUBDIR vim70 %define VIM_SUBDIR vim70
Summary: Vi IMproved Summary: Vi IMproved
URL: http://www.vim.org/ URL: http://www.vim.org/
@ -160,7 +160,7 @@ pushd src
CFLAGS="$RPM_OPT_FLAGS -Wall -pipe -fno-strict-aliasing -fstack-protector-all" CFLAGS="$RPM_OPT_FLAGS -Wall -pipe -fno-strict-aliasing -fstack-protector-all"
export CFLAGS export CFLAGS
./configure $RPM_ARCH-suse-linux \ ./configure $RPM_ARCH-suse-linux \
--prefix=/usr \ --prefix=%{_prefix} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--with-features=big \ --with-features=big \
--enable-cscope \ --enable-cscope \
@ -182,8 +182,7 @@ make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} STRIP=: install
#----------------------------------- #-----------------------------------
make distclean make distclean
./configure $RPM_ARCH-suse-linux \ ./configure $RPM_ARCH-suse-linux \
--bindir=/usr/bin \ --prefix=%{_prefix} \
--prefix=/usr \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--with-features=huge \ --with-features=huge \
--enable-cscope \ --enable-cscope \
@ -207,8 +206,8 @@ make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} STRIP=: install
#----------------------------------- #-----------------------------------
make distclean make distclean
./configure $RPM_ARCH-suse-linux \ ./configure $RPM_ARCH-suse-linux \
--bindir=/usr/X11R6/bin \ --prefix=%{_prefix} \
--prefix=/usr \ --bindir=%{_bindir} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--with-features=huge \ --with-features=huge \
--enable-cscope \ --enable-cscope \
@ -232,7 +231,7 @@ gcc $RPM_OPT_FLAGS -Wall $RPM_SOURCE_DIR/vitmp.c -o vitmp
%install %install
make -C src DESTDIR=$RPM_BUILD_ROOT \ make -C src DESTDIR=$RPM_BUILD_ROOT \
BINDIR=/usr/X11R6/bin \ BINDIR=%{_bindir} \
MANDIR=%{_mandir} \ MANDIR=%{_mandir} \
STRIP=: \ STRIP=: \
install install
@ -246,15 +245,15 @@ ln -sf vim $RPM_BUILD_ROOT/usr/bin/ex
ln -sf vim $RPM_BUILD_ROOT/usr/bin/vi ln -sf vim $RPM_BUILD_ROOT/usr/bin/vi
ln -sf vim $RPM_BUILD_ROOT/usr/bin/view ln -sf vim $RPM_BUILD_ROOT/usr/bin/view
ln -sf vim $RPM_BUILD_ROOT/usr/bin/vimdiff ln -sf vim $RPM_BUILD_ROOT/usr/bin/vimdiff
ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/gex ln -sf gvim $RPM_BUILD_ROOT/usr/bin/gex
ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/gvi ln -sf gvim $RPM_BUILD_ROOT/usr/bin/gvi
ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/gview ln -sf gvim $RPM_BUILD_ROOT/usr/bin/gview
ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/rgview ln -sf gvim $RPM_BUILD_ROOT/usr/bin/rgview
ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/rgvim ln -sf gvim $RPM_BUILD_ROOT/usr/bin/rgvim
ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/evim ln -sf gvim $RPM_BUILD_ROOT/usr/bin/evim
ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/egvim ln -sf gvim $RPM_BUILD_ROOT/usr/bin/egvim
ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/eview ln -sf gvim $RPM_BUILD_ROOT/usr/bin/eview
ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/gvimdiff ln -sf gvim $RPM_BUILD_ROOT/usr/bin/gvimdiff
ln -sf vim.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/vi.1.gz ln -sf vim.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/vi.1.gz
ln -sf vim.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/ex.1.gz ln -sf vim.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/ex.1.gz
ln -sf %{VIM_SUBDIR} $RPM_BUILD_ROOT/usr/share/vim/current ln -sf %{VIM_SUBDIR} $RPM_BUILD_ROOT/usr/share/vim/current
@ -271,16 +270,13 @@ rm -f $RPM_BUILD_ROOT/usr/share/man/man1/*ggvim*
rm -f $RPM_BUILD_ROOT/usr/share/man/man1/gvimtutor* rm -f $RPM_BUILD_ROOT/usr/share/man/man1/gvimtutor*
install -m 755 vitmp $RPM_BUILD_ROOT/bin/ install -m 755 vitmp $RPM_BUILD_ROOT/bin/
install -m 644 $RPM_SOURCE_DIR/vitmp.1 $RPM_BUILD_ROOT%{_mandir}/man1/ install -m 644 $RPM_SOURCE_DIR/vitmp.1 $RPM_BUILD_ROOT%{_mandir}/man1/
rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/gvimtutor $RPM_BUILD_ROOT/usr/X11R6/bin/xxd rm -f $RPM_BUILD_ROOT/usr/bin/gvimtutor $RPM_BUILD_ROOT/usr/X11R6/bin/xxd
mkdir -p $RPM_BUILD_ROOT//usr/share/pixmaps mkdir -p $RPM_BUILD_ROOT//usr/share/pixmaps
install -m 644 %{SOURCE16} $RPM_BUILD_ROOT/usr/share/pixmaps/ install -m 644 %{SOURCE16} $RPM_BUILD_ROOT/usr/share/pixmaps/
%suse_update_desktop_file -i gvim TextEditor 2> /dev/null %suse_update_desktop_file -i gvim TextEditor 2> /dev/null
rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/ex rm -f $RPM_BUILD_ROOT/usr/bin/ggvim
rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/ggvim rm -f $RPM_BUILD_ROOT/usr/bin/ggvimdiff
rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/ggvimdiff rm -f $RPM_BUILD_ROOT/usr/bin/rggvim
rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/rggvim
rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/rview
rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/view
rm -f $RPM_BUILD_ROOT/usr/bin/evim-enhanced rm -f $RPM_BUILD_ROOT/usr/bin/evim-enhanced
rm -f $RPM_BUILD_ROOT/usr/share/man/man1/evim-enhanced* rm -f $RPM_BUILD_ROOT/usr/share/man/man1/evim-enhanced*
rm -f $RPM_BUILD_ROOT/usr/share/man/*/man1/evim-enhanced* rm -f $RPM_BUILD_ROOT/usr/share/man/*/man1/evim-enhanced*
@ -326,16 +322,16 @@ rm -rf $RPM_BUILD_ROOT;
%ghost %config(missingok) /etc/gvimrc %ghost %config(missingok) /etc/gvimrc
/usr/share/applications/gvim.desktop /usr/share/applications/gvim.desktop
/usr/share/pixmaps/gvim.png /usr/share/pixmaps/gvim.png
/usr/X11R6/bin/gex /usr/bin/gex
/usr/X11R6/bin/gvi /usr/bin/gvi
/usr/X11R6/bin/gview /usr/bin/gview
/usr/X11R6/bin/gvim /usr/bin/gvim
/usr/X11R6/bin/rgview /usr/bin/rgview
/usr/X11R6/bin/rgvim /usr/bin/rgvim
/usr/X11R6/bin/evim /usr/bin/evim
/usr/X11R6/bin/egvim /usr/bin/egvim
/usr/X11R6/bin/gvimdiff /usr/bin/gvimdiff
/usr/X11R6/bin/eview /usr/bin/eview
%doc $RPM_SOURCE_DIR/README.SuSE $RPM_SOURCE_DIR/README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc %doc $RPM_SOURCE_DIR/README.SuSE $RPM_SOURCE_DIR/README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc
%files enhanced %files enhanced
@ -343,6 +339,8 @@ rm -rf $RPM_BUILD_ROOT;
/usr/bin/vim-enhanced /usr/bin/vim-enhanced
%changelog -n vim %changelog -n vim
* Wed Jan 24 2007 - mkoenig@suse.de
- move gvim and related stuff from /usr/X11R6/bin to /usr/bin
* Tue Jan 23 2007 - mkoenig@suse.de * Tue Jan 23 2007 - mkoenig@suse.de
- set default backspace functionality to a more "useful" - set default backspace functionality to a more "useful"
value [#34519] value [#34519]