From f1dd3151e6994ecdff643a78b2d71675be4f7827 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 13:57:11 +0000 Subject: auto-import changelog data from vim-5.7-6.src.rpm Sun Aug 06 2000 Tim Waugh - xterm doesn't have request version string (#14570) Sat Aug 05 2000 Bernhard Rosenkraenzer - Patchlevel 8 Fri Aug 04 2000 Bernhard Rosenkraenzer - Fix paths in vim.1 manpage (Bug #15387) Wed Jul 19 2000 Bernhard Rosenkraenzer - Fix up vimtutor (Bug #11455) Thu Jul 13 2000 Prospector - automatic rebuild Sun Jun 25 2000 Bernhard Rosenkraenzer - 5.7 release - some more fixes to .spec file syntax highlighting rules... About time it recognizes %{_mandir}... Sun Jun 18 2000 Bernhard Rosenkraenzer - 5.7a Sat Jun 03 2000 Bernhard Rosenkr�nzer - patchlevel 74 - add %makeinstall macro recognition to .spec file syntax highlighting rules - fix up Makefiles Fri Apr 14 2000 Bernhard Rosenkr�nzer - patchlevel 66 - fix compilation with perl 5.6.0 Mon Mar 20 2000 Bernhard Rosenkr�nzer - patchlevel 12 Tue Mar 07 2000 Preston Brown - fix home/end in vimrc (we did a term = rxvt, totally wrong) Tue Feb 29 2000 Preston Brown - change F1-F4 keybindings for xterm builtin terminfo to match real terminfo Thu Feb 17 2000 Bill Nottingham - kill autoindent Mon Feb 07 2000 Preston Brown - wmconfig -> desktop Sat Feb 05 2000 Bernhard Rosenkr�nzer - Patchlevel 11 - handle compressed man pages - fix man page symlinks Wed Feb 02 2000 Bill Nottingham - eliminate dependencies on X in vim-enhanced, and ncurses/gpm in vim-minimal Fri Jan 28 2000 Bill Nottingham - eliminate dependencies on csh and perl in vim-common Wed Jan 19 2000 Bernhard Rosenrk�nzer - Use awk, not nawk Tue Jan 18 2000 Bernhard Rosenrk�nzer - 5.6 - patch 5.6.001 - remove /usr/bin/vi - if you want vim, type vim Tue Jan 11 2000 Bernhard Rosenkr�nzer - 5.6a - Remove dependency on nawk (introduced by base update) - some tweaks to make updating easier Tue Nov 09 1999 Bernhard Rosenkr�nzer - 5.5 - fix path to vimrc Tue Jul 27 1999 Michael K. Johnson - moved from athena to gtk widgets for X version - removed vim.1 from X11 filelist because X11 depends on vim-common anyway - fixed rogue dependencies from sample files Tue Jul 27 1999 Jeff Johnson - update to 5.4. Thu Jul 22 1999 Jeff Johnson - man page had buildroot pollution (#3629). Thu Mar 25 1999 Preston Brown - with recent termcap/terminfo fixes, regular vim works in xterm/console - in color, so vim-color package removed. Tue Mar 23 1999 Erik Troan - removed "set backupdir=/tmp/vim_backup" from default vimrc Sun Mar 21 1999 Cristian Gafton - auto rebuild in the new build environment (release 5) Thu Dec 17 1998 Michael Maher - built pacakge for 6.0 Tue Sep 15 1998 Michael Maher - removed '--with-tlib=termcap' so that color-vim works Wed Sep 02 1998 Jeff Johnson - update to 5.3. Mon Aug 10 1998 Jeff Johnson - merge in Toshio's changes - color-vim: changed "--disable-p" to "--disable-perlinterp --with-tlib=termcap" - added minimal rvi/rview and man pages. - move Obsoletes to same package as executable. Thu Aug 06 1998 Toshio Kuratomi - Break the package apart similar to the way the netscape package was broken down to handle navigator or communicator: The vim package is Obsolete, now there is vim-common with all the common files, and a package for each binary: vim-minimal (has /bin/vi compiled with no frills), vim-enhanced (has /usr/bin/vim with extra perl and python interpreters), and vim-X11 (has /usr/X11R6/bin/gvim compiled with GUI support.) - Enable the perl and python interpreters in the gui version (gvim). Tue Jun 30 1998 Michael Maher - Fixed tutor help. - cvim package added. Thanks to Stevie Wills for finding this one :-) Thu May 07 1998 Prospector System - translations modified for de, fr, tr Fri May 01 1998 Donnie Barnes - added patch to turn off the "vi compatibility" by default. You can still get it via the -C command line option Thu Apr 23 1998 Donnie Barnes - removed perl and python interpreters (sorry, but those don't belong in a /bin/vi and having two vi's seemed like overkill...complain to suggest@redhat.com if you care) Fri Apr 17 1998 Donnie Barnes - fixed buildroot bug Sat Apr 11 1998 Donnie Barnes - updated from 4.6 to 5.1 - moved to buildroot Sun Nov 09 1997 Donnie Barnes - fixed missing man page Wed Oct 22 1997 Donnie Barnes - added wmconfig entry to vim-X11 Mon Oct 20 1997 Donnie Barnes - upgraded from 4.5 to 4.6 Fri Jun 13 1997 Erik Troan - built against glibc Tue Mar 25 1997 Michael K. Johnson - Upgraded to 4.5 - Added ex symlinks Tue Mar 11 1997 Michael K. Johnson - Added view symlink. --- diff --git a/.cvsignore b/.cvsignore index e69de29..153e17c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +vim-5.7-rt.tar.gz +vim-5.7-src.tar.gz diff --git a/sources b/sources index e69de29..0f1f716 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +b7d9cbc64479e26f52e2bc58d312bd84 vim-5.7-rt.tar.gz +0b2bca69c7018a8777d8d5390e23d06e vim-5.7-src.tar.gz diff --git a/vim.spec b/vim.spec new file mode 100644 index 0000000..892231a --- /dev/null +++ b/vim.spec @@ -0,0 +1,414 @@ +Summary: The VIM editor. +Name: vim +Version: 5.7 +%define vimversion vim57 +Release: 6 +Copyright: freeware +Group: Applications/Editors +Source0: ftp://ftp.home.vim.org/pub/vim/unix/vim-%{version}-src.tar.gz +Source1: ftp://ftp.home.vim.org/pub/vim/unix/vim-%{version}-rt.tar.gz +Source3: vimrc +Patch0: vim-4.2-speed_t.patch +Patch1: vim-5.1-vimnotvi.patch +Patch2: vim-5.6a-paths.patch +Patch3: vim-5.6-fixkeys.patch +Patch4: vim-5.6-specsyntax.patch +Patch5: vim-5.6-destdir.patch +Patch6: vim-5.7-redhat.patch +Patch7: vim-5.7-docpath.patch +Patch8: vim-5.7-crv.patch +Patch101: 5.7.001 +Patch102: 5.7.002 +Patch103: 5.7.003 +Patch104: 5.7.004 +Patch105: 5.7.005 +Patch106: 5.7.006 +Patch107: 5.7.007 +Patch108: 5.7.008 +Buildroot: /var/tmp/vim-root +Buildrequires: python-devel perl gtk+-devel + +%description +VIM (VIsual editor iMproved) is an updated and improved version of the +vi editor. Vi was the first real screen-based editor for UNIX, and is +still very popular. VIM improves on vi by adding new features: +multiple windows, multi-level undo, block highlighting and more. + +%package common +Summary: The common files needed by any version of the VIM editor. +Group: Applications/Editors + +%description common +VIM (VIsual editor iMproved) is an updated and improved version of the +vi editor. Vi was the first real screen-based editor for UNIX, and is +still very popular. VIM improves on vi by adding new features: +multiple windows, multi-level undo, block highlighting and more. The +vim-common package contains files which every VIM binary will need in +order to run. + +If you are installing any version of the VIM editor, you'll also need +to the vim-common package installed. + +%package minimal +Summary: A minimal version of the VIM editor. +Group: Applications/Editors +Requires: vim-common +Obsoletes: vim + +%description minimal +VIM (VIsual editor iMproved) is an updated and improved version of the +vi editor. Vi was the first real screen-based editor for UNIX, and is +still very popular. VIM improves on vi by adding new features: +multiple windows, multi-level undo, block highlighting and more. The +vim-minimal package includes a minimal version of VIM, which is +installed into /bin/vi for use when only the root partition is +present. + +%package enhanced +Summary: A version of the VIM editor which includes recent enhancements. +Group: Applications/Editors +Requires: vim-common +Obsoletes: vim-color + +%description enhanced +VIM (VIsual editor iMproved) is an updated and improved version of the +vi editor. Vi was the first real screen-based editor for UNIX, and is +still very popular. VIM improves on vi by adding new features: +multiple windows, multi-level undo, block highlighting and more. The +vim-enhanced package contains a version of VIM with extra, recently +introduced features like Python and Perl interpreters. + +Install the vim-enhanced package if you'd like to use a version of the +VIM editor which includes recently added enhancements like +interpreters for the Python and Perl scripting languages. You'll also +need to install the vim-common package. + +%package X11 +Summary: The VIM version of the vi editor for the X Window System. +Group: Applications/Editors +Requires: vim-common + +%description X11 +VIM (VIsual editor iMproved) is an updated and improved version of the +vi editor. Vi was the first real screen-based editor for UNIX, and is +still very popular. VIM improves on vi by adding new features: +multiple windows, multi-level undo, block highlighting and +more. VIM-X11 is a version of the VIM editor which will run within the +X Window System. If you install this package, you can run VIM as an X +application with a full GUI interface and mouse support. + +Install the vim-X11 package if you'd like to try out a version of vi +with graphics and mouse capabilities. You'll also need to install the +vim-common package. + +%prep +%setup -q -b 1 +%patch0 -p1 -b .4.2 +%patch1 -p1 -b .vim +# fix rogue dependencies from sample code +chmod -x runtime/tools/mve.awk +%patch2 -p1 -b .paths +find . -name \*.paths | xargs rm -f +%patch3 -p1 -b .fixkeys +%patch4 -p1 -b .highlite +%patch5 -p1 -b .destdir +%patch6 -p1 -b .redhat +%patch7 -p1 -b .docs +%patch8 -p1 -b .crv + +%patch101 -p0 -b .p1 +%patch102 -p0 -b .p2 +%patch103 -p0 -b .p3 +%patch104 -p0 -b .p4 +%patch105 -p0 -b .p5 +%patch106 -p0 -b .p6 +%patch107 -p0 -b .p7 +%patch108 -p0 -b .p8 + +perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk + +%build +cd src +perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimversion},g" os_unix.h +perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimversion}/macros,g" os_unix.h + +%configure --enable-max-features=yes --enable-pythoninterp --enable-perlinterp --disable-tclinterp --with-x=yes --enable-gui=gtk --exec-prefix=/usr/X11R6 +make if_perl.c +perl -pi -e "s,#define.*PL_na.*,,g" if_perl.c +perl -pi -e "s,#define.*PL_defgv.*,,g" if_perl.c +perl -pi -e "s,#define.*PL_errgv.*,,g" if_perl.c +make +cp vim gvim +make clean + +%configure --prefix=/usr --enable-max-features=yes --enable-pythoninterp \ + --enable-perlinterp --disable-tclinterp --with-x=no --enable-gui=no \ + --exec-prefix=/usr +make if_perl.c +perl -pi -e "s,#define.*PL_na.*,,g" if_perl.c +perl -pi -e "s,#define.*PL_defgv.*,,g" if_perl.c +perl -pi -e "s,#define.*PL_errgv.*,,g" if_perl.c +make +cp vim enhanced-vim +make clean + +%configure --prefix='${DEST}'/usr --enable-min-features=yes --with-x=no \ + --disable-pythoninterp --disable-perlinterp --disable-tclinterp \ + --with-tlib=termcap --enable-gui=no --disable-gpm --exec-prefix=/ +make if_perl.c +perl -pi -e "s,#define.*PL_na.*,,g" if_perl.c +perl -pi -e "s,#define.*PL_defgv.*,,g" if_perl.c +perl -pi -e "s,#define.*PL_errgv.*,,g" if_perl.c +make + + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/bin +mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/vim,X11R6/bin} + +cd src +%makeinstall BINDIR=$RPM_BUILD_ROOT/bin DESTDIR=$RPM_BUILD_ROOT +mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/usr/bin +make installmacros DESTDIR=$RPM_BUILD_ROOT +install -s -m755 gvim $RPM_BUILD_ROOT/usr/X11R6/bin +install -s -m755 enhanced-vim $RPM_BUILD_ROOT/usr/bin/vim + +( cd $RPM_BUILD_ROOT + mv ./bin/vim ./bin/vi + mv ./bin/vimtutor ./usr/bin + rm -f ./bin/rvim + ln -sf vi ./bin/view + ln -sf vi ./bin/ex + ln -sf vi ./bin/rvi + ln -sf vi ./bin/rview + ln -sf vim ./usr/bin/ex + perl -pi -e "s,$RPM_BUILD_ROOT,," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 + rm -f .%{_mandir}/man1/rvim.1 + ln -sf vim.1.gz .%{_mandir}/man1/vi.1.gz + ln -sf vim.1.gz .%{_mandir}/man1/rvi.1.gz + ln -sf vim.1.gz .%{_mandir}/man1/gvim.1.gz + ln -sf gvim ./usr/X11R6/bin/vimx + mkdir -p ./etc/X11/applnk/Utilities + cat > ./etc/X11/applnk/Utilities/gvim.desktop < +- xterm doesn't have request version string (#14570) + +* Sat Aug 5 2000 Bernhard Rosenkraenzer +- Patchlevel 8 + +* Fri Aug 4 2000 Bernhard Rosenkraenzer +- Fix paths in vim.1 manpage (Bug #15387) + +* Wed Jul 19 2000 Bernhard Rosenkraenzer +- Fix up vimtutor (Bug #11455) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Sun Jun 25 2000 Bernhard Rosenkraenzer +- 5.7 release +- some more fixes to .spec file syntax highlighting rules... About time it + recognizes %%{_mandir}... + +* Sun Jun 18 2000 Bernhard Rosenkraenzer +- 5.7a + +* Sat Jun 3 2000 Bernhard Rosenkr�nzer +- patchlevel 74 +- add %%makeinstall macro recognition to .spec file syntax highlighting rules +- fix up Makefiles + +* Fri Apr 14 2000 Bernhard Rosenkr�nzer +- patchlevel 66 +- fix compilation with perl 5.6.0 + +* Mon Mar 20 2000 Bernhard Rosenkr�nzer +- patchlevel 12 + +* Tue Mar 07 2000 Preston Brown +- fix home/end in vimrc (we did a term = rxvt, totally wrong) + +* Tue Feb 29 2000 Preston Brown +- change F1-F4 keybindings for xterm builtin terminfo to match real terminfo + +* Thu Feb 17 2000 Bill Nottingham +- kill autoindent + +* Mon Feb 07 2000 Preston Brown +- wmconfig -> desktop + +* Sat Feb 5 2000 Bernhard Rosenkr�nzer +- Patchlevel 11 +- handle compressed man pages +- fix man page symlinks + +* Wed Feb 2 2000 Bill Nottingham +- eliminate dependencies on X in vim-enhanced, and ncurses/gpm + in vim-minimal + +* Fri Jan 28 2000 Bill Nottingham +- eliminate dependencies on csh and perl in vim-common + +* Wed Jan 19 2000 Bernhard Rosenrk�nzer +- Use awk, not nawk + +* Tue Jan 18 2000 Bernhard Rosenrk�nzer +- 5.6 +- patch 5.6.001 +- remove /usr/bin/vi - if you want vim, type vim + +* Tue Jan 11 2000 Bernhard Rosenkr�nzer +- 5.6a +- Remove dependency on nawk (introduced by base update) +- some tweaks to make updating easier + +* Tue Nov 9 1999 Bernhard Rosenkr�nzer +- 5.5 +- fix path to vimrc + +* Tue Jul 27 1999 Michael K. Johnson +- moved from athena to gtk widgets for X version +- removed vim.1 from X11 filelist because X11 depends on vim-common anyway +- fixed rogue dependencies from sample files + +* Tue Jul 27 1999 Jeff Johnson +- update to 5.4. + +* Thu Jul 22 1999 Jeff Johnson +- man page had buildroot pollution (#3629). + +* Thu Mar 25 1999 Preston Brown +- with recent termcap/terminfo fixes, regular vim works in xterm/console +- in color, so vim-color package removed. + +* Tue Mar 23 1999 Erik Troan +- removed "set backupdir=/tmp/vim_backup" from default vimrc + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 5) + +* Thu Dec 17 1998 Michael Maher +- built pacakge for 6.0 + +* Tue Sep 15 1998 Michael Maher +- removed '--with-tlib=termcap' so that color-vim works + +* Wed Sep 2 1998 Jeff Johnson +- update to 5.3. + +* Mon Aug 10 1998 Jeff Johnson +- merge in Toshio's changes +- color-vim: changed "--disable-p" to "--disable-perlinterp --with-tlib=termcap" +- added minimal rvi/rview and man pages. +- move Obsoletes to same package as executable. + +* Thu Aug 06 1998 Toshio Kuratomi +- Break the package apart similar to the way the netscape package was + broken down to handle navigator or communicator: The vim package is + Obsolete, now there is vim-common with all the common files, and a + package for each binary: vim-minimal (has /bin/vi compiled with no + frills), vim-enhanced (has /usr/bin/vim with extra perl and python + interpreters), and vim-X11 (has /usr/X11R6/bin/gvim compiled with + GUI support.) +- Enable the perl and python interpreters in the gui version (gvim). + +* Tue Jun 30 1998 Michael Maher +- Fixed tutor help. +- cvim package added. Thanks to Stevie Wills for finding this one :-) + +* Thu May 07 1998 Prospector System +- translations modified for de, fr, tr + +* Fri May 01 1998 Donnie Barnes +- added patch to turn off the "vi compatibility" by default. You can + still get it via the -C command line option + +* Thu Apr 23 1998 Donnie Barnes +- removed perl and python interpreters (sorry, but those don't belong + in a /bin/vi and having two vi's seemed like overkill...complain + to suggest@redhat.com if you care) + +* Fri Apr 17 1998 Donnie Barnes +- fixed buildroot bug + +* Sat Apr 11 1998 Donnie Barnes +- updated from 4.6 to 5.1 +- moved to buildroot + +* Sun Nov 09 1997 Donnie Barnes +- fixed missing man page + +* Wed Oct 22 1997 Donnie Barnes +- added wmconfig entry to vim-X11 + +* Mon Oct 20 1997 Donnie Barnes +- upgraded from 4.5 to 4.6 + +* Fri Jun 13 1997 Erik Troan +- built against glibc + +* Tue Mar 25 1997 Michael K. Johnson +- Upgraded to 4.5 +- Added ex symlinks + +* Tue Mar 11 1997 Michael K. Johnson +- Added view symlink. diff --git a/vimrc b/vimrc new file mode 100644 index 0000000..d06ded3 --- /dev/null +++ b/vimrc @@ -0,0 +1,87 @@ +set nocompatible " Use Vim defaults (much better!) +set bs=2 " allow backspacing over everything in insert mode +"set ai " always set autoindenting on +"set backup " keep a backup file +set viminfo='20,\"50 " read/write a .viminfo file, don't store more + " than 50 lines of registers +set history=50 " keep 50 lines of command line history +set ruler " show the cursor position all the time + +" Only do this part when compiled with support for autocommands +if has("autocmd") + " In text files, always limit the width of text to 78 characters + autocmd BufRead *.txt set tw=78 + " When editing a file, always jump to the last cursor position + autocmd BufReadPost * if line("'\"") | exe "'\"" | endif +endif + +" Don't use Ex mode, use Q for formatting +map Q gq + +" Switch syntax highlighting on, when the terminal has colors +" Also switch on highlighting the last used search pattern. +if &t_Co > 2 || has("gui_running") + syntax on + set hlsearch +endif + +if has("autocmd") + augroup cprog + " Remove all cprog autocommands + au! + + " When starting to edit a file: + " For C and C++ files set formatting of comments and set C-indenting on. + " For other files switch it off. + " Don't change the order, it's important that the line with * comes first. + autocmd FileType * set formatoptions=tcql nocindent comments& + autocmd FileType c,cpp set formatoptions=croql cindent comments=sr:/*,mb:*,el:*/,:// + augroup END + + augroup gzip + " Remove all gzip autocommands + au! + + " Enable editing of gzipped files + " read: set binary mode before reading the file + " uncompress text in buffer after reading + " write: compress file after writing + " append: uncompress file, append, compress file + autocmd BufReadPre,FileReadPre *.gz set bin + autocmd BufReadPost,FileReadPost *.gz let ch_save = &ch|set ch=2 + autocmd BufReadPost,FileReadPost *.gz '[,']!gunzip + autocmd BufReadPost,FileReadPost *.gz set nobin + autocmd BufReadPost,FileReadPost *.gz let &ch = ch_save|unlet ch_save + autocmd BufReadPost,FileReadPost *.gz execute ":doautocmd BufReadPost " . expand("%:r") + + autocmd BufWritePost,FileWritePost *.gz !mv :r + autocmd BufWritePost,FileWritePost *.gz !gzip :r + + autocmd FileAppendPre *.gz !gunzip + autocmd FileAppendPre *.gz !mv :r + autocmd FileAppendPost *.gz !mv :r + autocmd FileAppendPost *.gz !gzip :r + augroup END +endif +if &term=="xterm" + set t_Co=8 + set t_Sb=^[4%dm + set t_Sf=^[3%dm +endif + +" some extra commands for HTML editing +nmap ,mh wbgueyei<ea>pa>bba +nmap ,h1 _i

A

+nmap ,h2 _i

A

+nmap ,h3 _i

A

+nmap ,h4 _i

A

+nmap ,h5 _i
A
+nmap ,h6 _i
A
+nmap ,hb wbieabb +nmap ,he wbieabb +nmap ,hi wbieabb +nmap ,hu wbieabb +nmap ,hs wbieabb +nmap ,ht wbieabb +nmap ,hx wbFf +