- added evim,eview,vimdiff,gvimdiff symlinks

- more man packaging fixes
- separated -spell-en
- hicolor-icon-theme deps (because of post/postun scripts)

Changed files:
    vim.spec -> 1.377

diff --git a/vim.spec b/vim.spec
index c8eec623b375f7a8e997541cdb8ca6b067692325..4c83b65ea6888492b5906b5325a9cb7b1d6594a3 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -1,5 +1,4 @@
 # TODO:
-# - separate vim-spell-en
 # - some nice icon
 # - bonobo patches need update
 #
@@ -10,7 +9,7 @@
 %bcond_without gtk             # don't build GTK+-based gvim support
 %bcond_without gnome           # don't build GNOME-based gvim support
 %bcond_without perl            # without Perl interp
-%bcond_with            python          # without Python interp
+%bcond_with    python          # with Python interp
 %bcond_with    ruby            # with Ruby interp
 %bcond_with    tcl             # with Tcl interp
 %bcond_with    bonobo          # with bonobo component (breaks other things)
@@ -443,6 +442,18 @@ k
 ðÁËÅÔ vim-rt ͦÓÔÉÔØ ÆÁÊÌÉ (ÎÁÐÒÉËÌÁÄ, ÆÁÊÌÉ ÄÏצÄËÉ), ËÏÔÒ¦ ÐÏÔÒ¦ÂΦ
 ÄÌÑ ÒÏÂÏÔÉ ÂÕÄØ-ÑËϧ ÐÒÏÇÒÁÍÉ vim.
 
+%package spell-en
+Summary:       English dictionaries for VIMspell
+Summary(pl):   Angielskie s³owniki dla VIMspella
+Group:         Applications/Editors/Vim
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description spell-en
+English dictionaries for VIMspell.
+
+%description spell-en -l pl
+Angielskie s³owniki dla VIMspella.
+
 %package -n gvim-athena
 Summary:       Vim for X Window built with Athena
 Summary(pl):   Vim dla X Window korzystaj±cy z biblioteki Athena
@@ -502,6 +513,7 @@ Summary:    Vim for X Window built with gtk
 Summary(pl):   Vim dla X Window korzystaj±cy z biblioteki GTK
 Group:         Applications/Editors/Vim
 Requires(post,postun): gtk+2
+Requires(post,postun): hicolor-icon-theme
 Requires:      %{name}-rt = %{epoch}:%{version}-%{release}
 Requires:      iconv
 Provides:      vi-editor
@@ -531,6 +543,7 @@ Summary:    Vim for X Window built with GNOME
 Summary(pl):   Vim dla X Window korzystaj±cy z biblioteki GNOME
 Group:         Applications/Editors/Vim
 Requires(post,postun): gtk+2
+Requires(post,postun): hicolor-icon-theme
 Requires:      %{name}-rt = %{epoch}:%{version}-%{release}
 Requires:      iconv
 Provides:      vi-editor
@@ -937,7 +950,10 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/??.*/
 mv -f $RPM_BUILD_ROOT%{_datadir}/vim/v*/vimrc_example.vim $RPM_BUILD_ROOT%{_sysconfdir}/vim/vimrc
 mv -f $RPM_BUILD_ROOT%{_datadir}/vim/v*/gvimrc_example.vim $RPM_BUILD_ROOT%{_sysconfdir}/vim/gvimrc
 
+ln -sf vim $RPM_BUILD_ROOT%{_bindir}/eview
+ln -sf vim $RPM_BUILD_ROOT%{_bindir}/evim
 ln -sf vim $RPM_BUILD_ROOT%{_bindir}/rvim
+ln -sf vim $RPM_BUILD_ROOT%{_bindir}/vimdiff
 ln -sf vi  $RPM_BUILD_ROOT/bin/ex
 ln -sf vi  $RPM_BUILD_ROOT/bin/view
 ln -sf vi  $RPM_BUILD_ROOT/bin/rview
@@ -959,9 +975,10 @@ install %{SOURCE13}        $RPM_BUILD_ROOT%{_desktopdir}
 %if %{with gtk}
 install src/bin/gvim.gtk       $RPM_BUILD_ROOT%{_bindir}/gvim.gtk
 ln -sf gvim.gtk                $RPM_BUILD_ROOT%{_bindir}/gvim
-ln -sf gvim            $RPM_BUILD_ROOT%{_bindir}/rgvim
 ln -sf gvim            $RPM_BUILD_ROOT%{_bindir}/gview
+ln -sf gvim            $RPM_BUILD_ROOT%{_bindir}/gvimdiff
 ln -sf gvim            $RPM_BUILD_ROOT%{_bindir}/rgview
+ln -sf gvim            $RPM_BUILD_ROOT%{_bindir}/rgvim
 install %{SOURCE12}    $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 
@@ -979,9 +996,6 @@ install src/bin/vim-{component,factory} $RPM_BUILD_ROOT%{_bindir}
 
 bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-# non-existent binaries
-rm -rf $RPM_BUILD_ROOT%{_mandir}/*/man1/{evim,{,g}vimdiff}.1
-
 unzip -qd $RPM_BUILD_ROOT%{_datadir}/vim/v*/doc %{SOURCE3}
 
 install -d $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/{doc,{after/,}{compiler,ftdetect,ftplugin,indent,plugin,spell,syntax}}
@@ -1026,13 +1040,33 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/vim
+%attr(755,root,root) %{_bindir}/eview
+%attr(755,root,root) %{_bindir}/evim
 %attr(755,root,root) %{_bindir}/rvim
-%{_mandir}/man1/rvim.*
-%lang(fi) %{_mandir}/fi/man1/rvim.*
-%lang(fr) %{_mandir}/fr/man1/rvim.*
-%lang(id) %{_mandir}/id/man1/rvim.*
-%lang(pl) %{_mandir}/pl/man1/rvim.*
+%attr(755,root,root) %{_bindir}/vim
+%attr(755,root,root) %{_bindir}/vimdiff
+%{_mandir}/man1/eview.1*
+%{_mandir}/man1/evim.1*
+%{_mandir}/man1/rvim.1*
+%{_mandir}/man1/vimdiff.1*
+%lang(fi) %{_mandir}/fi/man1/rvim.1*
+%lang(fr) %{_mandir}/fr/man1/eview.1*
+%lang(fr) %{_mandir}/fr/man1/evim.1*
+%lang(fr) %{_mandir}/fr/man1/rvim.1*
+%lang(fr) %{_mandir}/fr/man1/vimdiff.1*
+%lang(id) %{_mandir}/id/man1/rvim.1*
+%lang(it) %{_mandir}/it/man1/eview.1*
+%lang(it) %{_mandir}/it/man1/evim.1*
+%lang(it) %{_mandir}/it/man1/rvim.1*
+%lang(it) %{_mandir}/it/man1/vimdiff.1*
+%lang(pl) %{_mandir}/pl/man1/eview.1*
+%lang(pl) %{_mandir}/pl/man1/evim.1*
+%lang(pl) %{_mandir}/pl/man1/rvim.1*
+%lang(pl) %{_mandir}/pl/man1/vimdiff.1*
+%lang(ru) %{_mandir}/ru/man1/eview.1*
+%lang(ru) %{_mandir}/ru/man1/evim.1*
+%lang(ru) %{_mandir}/ru/man1/rvim.1*
+%lang(ru) %{_mandir}/ru/man1/vimdiff.1*
 %{_desktopdir}/%{name}.desktop
 
 %if %{with static}
@@ -1040,7 +1074,6 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 %endif
 %defattr(644,root,root,755)
 %attr(755,root,root) /bin/*
-
 %{_mandir}/man1/vi.1*
 %{_mandir}/man1/ex.1*
 %{_mandir}/man1/view.1*
@@ -1162,7 +1195,6 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %dir %{_datadir}/vim/v*/spell
 %{_datadir}/vim/v*/spell/cleanadd.vim
-%lang(en_GB) %{_datadir}/vim/v*/spell/en.*.*
 %lang(he) %{_datadir}/vim/v*/spell/he.*
 %lang(yi) %{_datadir}/vim/v*/spell/yi.*
 
@@ -1177,24 +1209,29 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 %{_datadir}/vim/v*/autoload
 %{_datadir}/vim/v*/*.vim
 
-%{_mandir}/man1/vim*
-%{_mandir}/man1/rvim.*
-%lang(fi) %{_mandir}/fi/man1/vim*
-%lang(fi) %{_mandir}/fi/man1/rvim.*
-%lang(fi) %{_mandir}/fi/man1/gvi*
-%lang(fi) %{_mandir}/fi/man1/rgv*
-%lang(fr) %{_mandir}/fr/man1/vim*
-%lang(fr) %{_mandir}/fr/man1/rvim.*
-%lang(fr) %{_mandir}/fr/man1/gvi*
-%lang(fr) %{_mandir}/fr/man1/rgv*
-%lang(id) %{_mandir}/id/man1/vim*
-%lang(it) %{_mandir}/it/man1/vim*
-%lang(pl) %{_mandir}/pl/man1/vim*
-%lang(ru) %{_mandir}/ru/man1/vim*
+%{_mandir}/man1/rvim.1*
+%{_mandir}/man1/vim.1*
+%{_mandir}/man1/vimtutor.1*
+%lang(fi) %{_mandir}/fi/man1/rvim.1*
+%lang(fi) %{_mandir}/fi/man1/vim.1*
+%lang(fr) %{_mandir}/fr/man1/rvim.1*
+%lang(fr) %{_mandir}/fr/man1/vim.1*
+%lang(fr) %{_mandir}/fr/man1/vimtutor.1*
+%lang(id) %{_mandir}/id/man1/vim.1*
+%lang(it) %{_mandir}/it/man1/vim.1*
+%lang(it) %{_mandir}/it/man1/vimtutor.1*
+%lang(pl) %{_mandir}/pl/man1/vim.1*
+%lang(pl) %{_mandir}/pl/man1/vimtutor.1*
+%lang(ru) %{_mandir}/ru/man1/vim.1*
+%lang(ru) %{_mandir}/ru/man1/vimtutor.1*
 %{_iconsdir}/hicolor/16x16/apps/vim.png
 %{_iconsdir}/hicolor/32x32/apps/vim.png
 %{_iconsdir}/hicolor/48x48/apps/vim.png
 
+%files spell-en
+%defattr(644,root,root,755)
+%{_datadir}/vim/v*/spell/en.*.*
+
 %if %{with athena}
 %files -n gvim-athena
 %defattr(644,root,root,755)
@@ -1213,17 +1250,24 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 %files -n gvim-gtk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gvim.gtk
+%attr(755,root,root) %{_bindir}/gvimdiff
 %attr(755,root,root) %{_bindir}/rgvim
 %attr(755,root,root) %{_bindir}/rgview
 %attr(755,root,root) %verify(not link) %{_bindir}/gvim
+%{_mandir}/man1/gvi*
+%{_mandir}/man1/rgv*
 %lang(fi) %{_mandir}/fi/man1/gvi*
 %lang(fi) %{_mandir}/fi/man1/rgv*
 %lang(fr) %{_mandir}/fr/man1/gvi*
 %lang(fr) %{_mandir}/fr/man1/rgv*
 %lang(id) %{_mandir}/id/man1/gvi*
 %lang(id) %{_mandir}/id/man1/rgv*
+%lang(it) %{_mandir}/it/man1/gvi*
+%lang(it) %{_mandir}/it/man1/rgv*
 %lang(pl) %{_mandir}/pl/man1/gvi*
 %lang(pl) %{_mandir}/pl/man1/rgv*
+%lang(ru) %{_mandir}/ru/man1/gvi*
+%lang(ru) %{_mandir}/ru/man1/rgv*
 %{_desktopdir}/gvim-gtk.desktop
 %endif