vim static, rt && ncurses

Changed files:
    vim.spec -> 1.19

diff --git a/vim.spec b/vim.spec
index c8f117422ca03b355181a163e385b465e1f1045e..f5aab47708c0b6b75f95c1438de895c6113987a3 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -2,38 +2,31 @@ Summary:      Vim built with ncurses
 Summary(pl):   Vim korzystaj±cy z bibliotek ncurses
 Name:          vim
 Version:       5.4k
-Release:       2
-Source0:        ftp://ftp.nl.vim.org/pub/vim/unreleased/unix/%{name}-%{version}-src.tar.gz
-Source1:        ftp://ftp.nl.vim.org/pub/vim/unreleased/unix/%{name}-%{version}-rt.tar.gz
-Source2:        ftp://ftp.nl.vim.org/pub/vim/unreleased/extra/%{name}-%{version}-extra.tar.gz
-Source3:       gvim.wmconfig
+Release:       3
+########       ftp://ftp.nl.vim.org/pub/vim/unreleased
+Source0:        %{name}-%{version}-src.tar.gz
+Source1:        %{name}-%{version}-rt.tar.gz
+Source2:        %{name}-%{version}-extra.tar.gz
+Patch0:                vim-fhs.patch
 Copyright:     GPL
 Group:         Applications/Editors/Vim
 Group(pl):     Aplikacje/Edytory/Vim
 URL:           http://www.vim.org/
-BuildPrereq:   ncurses-static
-BuildPrereq:   lesstif-devel
-BuildPrereq:   gtk+-devel
-BuildPrereq:   glib-devel
-BuildPrereq:   gpm-devel
-Obsoletes:     vim-gtk
-Obsoletes:     vim-lesstif
-Obsoletes:     vim-athena
-Obsoletes:     vim-ncurses
+#BuildPrereq:  ncurses-static
+#BuildPrereq:  gpm-devel
 Buildroot:     /tmp/%{name}-%{version}-root
 
 %description 
-The classic Unix text editor build with ncurses library. It adds
-multiple windows, multi-level undo, block highliting, and many other
-features to the standard vi program.
+The classic Unix text editor. This version is build with minimal
+feature and is installed in /bin as a rescue tool. The installation of
+this package is STRONGLY recommended.
 
-%description -l pl
-Wersja edytora vim skompilowana z bibliotek± ncurses. W porownaniu z
-edytorem vi, ta wersja oferuje dodatkowo pracê z wieloma plikami,
-wielopoziomowe operacje cofnij, bloki, pod¶wietlanie sk³adni i wiele
-innych usprawnieñ.
+%description 
+Pakiet zawiera vim - klasyczny (unixowy) edytor tekstowy skompilowany 
+statycznie. Instalacja tego pakietu jest MOCNO zalecana, mo¿e on pomóc
+Tobie uratowaæ system w czasie awarii.
 
-%package rt 
+%package       rt 
 Summary:       Vim runtime files
 Summary(pl):   Pliki przydatne edytorowi vim 
 Group:         Applications/Editors/Vim
@@ -49,84 +42,29 @@ W tym pakiecie znajdziesz dokumentacj
 podrêcznika edytora vim. Je¿eli zamierzasz korzystaæ z vim-a, powiniene¶
 zainstalowaæ ten pakiet.
 
-%package static
-Summary:       Vim static
-Summary(pl):   Vim skompilowany statycznie
+%package       ncurses
+Summary:       Vim ncurses
+Summary(pl):   Vim ncurses
 Group:         Applications/Editors/Vim
 Group(pl):     Aplikacje/Edytory/Vim
-Provides:      vi
-Obsoletes:     vi
-Requires:      ncurses >= 4.2-12
-
-%description static
-The classic Unix text editor. This version is build with minimal
-feature and is installed in /bin as a rescue tool. The installation of
-this package is STRONGLY recommended.
-
-%description static -l pl
-Pakiet zawiera vim - klasyczny (unixowy) edytor tekstowy skompilowany 
-statycznie. Instalacja tego pakietu jest MOCNO zalecana, mo¿e on pomóc
-Tobie uratowaæ system w czasie awarii.
-
-%package athena
-Summary:       Vim built with X11 and athena support
-Summary(pl):   Vim pod X-Window korzystaj±cy z Athena Widget Set
-Group:         Applications/Editors/Vim
-Group(pl):     Aplikacje/Edytory/Vim
-Requires:      %{name}-rt = %{version}
-Obsoletes:     vim-lesstif
-Obsoletes:     vim-gtk
-Obsoletes:     vim-ncurses
-Obsoletes:     vim
-
-%description athena 
-The classic Unix text editor now also under X Window System! 
-This version is build with Athena Widget Set. 
-
-%description athena -l pl
-Wersja edytora vim pracuj±ca w graficznym ¶rodowisku X Window
-z wykorzystaniem Athena Widget Set.
-
-%package lesstif
-Summary:       Vim built with X11 and LessTif support
-Summary(pl):   Vim pod X-Window korzystaj±cy z bibliotek LessTif
-Group:         Applications/Editors/Vim
-Group(pl):     Aplikacje/Edytory/Vim
-Requires:      %{name}-rt = %{version}
 Obsoletes:     vim-athena
 Obsoletes:     vim-gtk
-Obsoletes:     vim-ncurses
-Obsoletes:     vim
-
-%description lesstif
-The classic Unix text editor now also under X Window System! 
-This version is build with LessTif.
-
-%description lesstif -l pl
-Wersja edytora vim pracuj±ca w graficznym ¶rodowisku X Window
-z wykorzystaniem LessTif.
-
-%package gtk
-Summary:       Vim built with X11 and gtk support
-Summary(pl):   Vim pod X-Window korzystaj±cy z bibliotek gtk
-Group:         Applications/Editors/Vim
-Group(pl):     Aplikacje/Edytory/Vim
-Requires:      %{name}-rt = %{version}
-Obsoletes:     vim-athena
 Obsoletes:     vim-lesstif
-Obsoletes:      vim-ncurses
-Obsoletes:     vim
 
-%description gtk
-The classic Unix text editor now also under X Window System!
-This version is build with gtk.
+%description ncurses 
+The classic Unix text editor build with ncurses library. It adds
+multiple windows, multi-level undo, block highliting, and many other
+features to the standard vi program.
 
-%description gtk -l pl
-Wersja edytora vim pracuj±ca w graficznym ¶rodowisku X Window
-z wykorzystaniem gtk.
+%description ncurses -l pl
+Wersja edytora vim skompilowana z bibliotek± ncurses. W porownaniu z
+edytorem vi, ta wersja oferuje dodatkowo pracê z wieloma plikami,
+wielopoziomowe operacje cofnij, bloki, pod¶wietlanie sk³adni i wiele
+innych usprawnieñ.
 
 %prep
 %setup -q -b 1 -b 2
+%patch -p1
 
 %build
 cd src
@@ -163,70 +101,18 @@ LDFLAGS="-s"; export LDFLAGS
 make vim
 mv vim vim.ncurses
 
-make distclean
-LDFLAGS="-s"; export LDFLAGS
-%configure \
-        --enable-max-features \
-       --enable-gui=athena \
-       --with-x \
-       --disable-perlinterp \
-       --disable-pythoninterp \
-       --disable-tclinterp \
-       --disable-cscope \
-       --enable-gmp \
-       --with-tlib=ncurses 
-make vim
-mv vim vim.athena
-
-make distclean
-LDFLAGS="-s"; export LDFLAGS
-%configure \
-        --enable-max-features \
-       --enable-gui=motif \
-       --with-x \
-       --disable-perlinterp \
-       --disable-pythoninterp \
-       --disable-tclinterp \
-       --disable-cscope \
-       --enable-gmp \
-       --with-tlib=ncurses 
-make vim
-mv vim vim.lesstif
-
-make distclean
-LDFLAGS="-s"; export LDFLAGS
-%configure \
-        --enable-max-features \
-       --enable-gui=gtk \
-       --with-x \
-       --disable-perlinterp \
-       --disable-pythoninterp \
-       --disable-tclinterp \
-       --disable-cscope \
-       --enable-gmp \
-       --with-tlib=ncurses 
-make vim
-mv vim vim.gtk
-
 cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/etc/X11/wmconfig
-install -d $RPM_BUILD_ROOT/bin
-install -d $RPM_BUILD_ROOT/usr/{bin,X11R6/bin,share/vim/{doc,tutor},share/man/man1}
-
-# make prefix=$RPM_BUILD_ROOT/usr install
+install -d $RPM_BUILD_ROOT/{bin,var/state/vim}
+install -d $RPM_BUILD_ROOT%{_prefix}/{bin,share/{vim/{doc,tutor},man/man1}}
 
 install -s src/vim.static $RPM_BUILD_ROOT/bin/vi
 install -s src/xxd.static $RPM_BUILD_ROOT/bin/xxd
 
-install -s src/vim.ncurses $RPM_BUILD_ROOT%{_bindir}/vim.ncurses
-install -s src/vim.athena  $RPM_BUILD_ROOT/usr/X11R6/bin/gvim.athena
-install -s src/vim.lesstif $RPM_BUILD_ROOT/usr/X11R6/bin/gvim.lesstif
-install -s src/vim.gtk     $RPM_BUILD_ROOT/usr/X11R6/bin/gvim.gtk
-
+install -s src/vim.ncurses $RPM_BUILD_ROOT%{_bindir}/vim
 install    src/vimtutor           $RPM_BUILD_ROOT%{_bindir}/vimtutor
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.1
@@ -234,17 +120,13 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.1
 install runtime/doc/vim.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install runtime/doc/vim.1 $RPM_BUILD_ROOT%{_mandir}/man1/vi.1
 install runtime/doc/xxd.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
 install runtime/doc/vimtutor.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 echo ".so vi.1" > $RPM_BUILD_ROOT%{_mandir}/man1/ex.1
 echo ".so vi.1" > $RPM_BUILD_ROOT%{_mandir}/man1/view.1
 echo ".so vi.1" > $RPM_BUILD_ROOT%{_mandir}/man1/rview.1
-
-echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gvim.1
-echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gview.1
 echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/rvim.1
-echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/rgvim.1
-echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/rgview.1
 
 cp -a runtime/macros $RPM_BUILD_ROOT%{_datadir}/vim/macros
 cp -a runtime/syntax $RPM_BUILD_ROOT%{_datadir}/vim/syntax
@@ -252,9 +134,8 @@ cp -a runtime/tutor/tutor  $RPM_BUILD_ROOT%{_datadir}/vim/tutor/tutor
 
 install runtime/*.vim $RPM_BUILD_ROOT%{_datadir}/vim
 install runtime/vimrc_example.vim $RPM_BUILD_ROOT%{_datadir}/vim/vimrc
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/wmconfig/gvim
 
-touch $RPM_BUILD_ROOT%{_bindir}/vim $RPM_BUILD_ROOT/usr/X11R6/bin/gvim
+touch $RPM_BUILD_ROOT%{_bindir}/vi
 
 install runtime/doc/*.txt $RPM_BUILD_ROOT%{_datadir}/vim/doc
 install runtime/doc/tags  $RPM_BUILD_ROOT%{_datadir}/vim/doc
@@ -266,80 +147,38 @@ ln -sf /bin/vi $RPM_BUILD_ROOT%{_bindir}/vi
 
 ln -sf vim $RPM_BUILD_ROOT%{_bindir}/rvim
 
-ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/rgvim
-ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/gview
-ln -sf gvim $RPM_BUILD_ROOT/usr/X11R6/bin/rgview
-
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-ln -sf %{_bindir}/vim.ncurses /usr/bin/vim
-
-%post athena
-ln -sf /usr/X11R6/bin/gvim.athena /usr/X11R6/bin/gvim
-ln -sf /usr/X11R6/bin/gvim %{_bindir}/vim
-
-%post lesstif 
-ln -sf /usr/X11R6/bin/gvim.lesstif /usr/X11R6/bin/gvim
-ln -sf /usr/X11R6/bin/gvim %{_bindir}/vim
-
-%post gtk
-ln -sf /usr/X11R6/bin/gvim.gtk /usr/X11R6/bin/gvim
-ln -sf /usr/X11R6/bin/gvim %{_bindir}/vim
-
 %files 
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/vim.ncurses
-%attr(755,root,root) %{_bindir}/rvim
-%attr(755,root,root) %ghost %{_bindir}/vim
-
-%files static
-%defattr(644,root,root,755)
 %attr(755,root,root) /bin/*
 %attr(755,root,root) %{_bindir}/vi
+
 %{_mandir}/man1/vi.1*
 %{_mandir}/man1/ex.1*
 %{_mandir}/man1/xxd.1*
 %{_mandir}/man1/view.1*
 %{_mandir}/man1/rview.1*
 
-%files athena
-%defattr(644,root,root,755)
-%attr(755,root,root) /usr/X11R6/bin/gvim.athena
-%attr(755,root,root) /usr/X11R6/bin/rgvim
-%attr(755,root,root) /usr/X11R6/bin/rgview
-/etc/X11/wmconfig/gvim
-%attr(755,root,root) %ghost /usr/X11R6/bin/gvim
-%attr(755,root,root) %ghost %{_bindir}/vim
-
-%files lesstif 
-%defattr(644,root,root,755)
-%attr(755,root,root) /usr/X11R6/bin/gvim.lesstif
-%attr(755,root,root) /usr/X11R6/bin/rgvim
-%attr(755,root,root) /usr/X11R6/bin/rgview
-/etc/X11/wmconfig/gvim
-%attr(755,root,root) %ghost /usr/X11R6/bin/gvim
-%attr(755,root,root) %ghost %{_bindir}/vim
-
-%files gtk
+%dir /var/state/vim
+
+%files ncurses
 %defattr(644,root,root,755)
-%attr(755,root,root) /usr/X11R6/bin/gvim.gtk
-%attr(755,root,root) /usr/X11R6/bin/rgvim
-%attr(755,root,root) /usr/X11R6/bin/rgview
-/etc/X11/wmconfig/gvim
-%attr(755,root,root) %ghost /usr/X11R6/bin/gvim
-%attr(755,root,root) %ghost %{_bindir}/vim
+
+%attr(755,root,root) %{_bindir}/vim
+%attr(755,root,root) %{_bindir}/rvim
+
+%{_mandir}/man1/vim.*
+%{_mandir}/man1/rvim.*
 
 %files rt
 %defattr(644,root,root,755)
 
 %attr(755,root,root) %{_bindir}/vimtutor
 
-%{_mandir}/man1/*
-
 %dir %{_datadir}/vim
 %{_datadir}/vim/macros
 
@@ -358,6 +197,12 @@ ln -sf /usr/X11R6/bin/gvim %{_bindir}/vim
 %config %verify(not size mtime md5) %{_datadir}/vim/vimrc
 
 %changelog
+* Sun Jun 13 1999 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
+   [5.4k-3]
+-  added /var/state/vim -- FHS 2.0
+-  build only vim-ncurses, vim-rt & vim (static) packages
+-  added default symlink /usr/bin/vi -> /bin/vi
+
 * Mon Jun 07 1999 Jan Rêkorajski <baggins@pld.org.pl>
   [5.4k-2]
 - fixed non-static builds