SPECS: vim.spec - added evim, eview, vimdiff, gvimdiff symlinks - mor...

Wed Oct 4 01:45:10 CEST 2006

Author: qboosh                       Date: Tue Oct  3 23:45:10 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added evim,eview,vimdiff,gvimdiff symlinks
- more man packaging fixes
- separated -spell-en
- hicolor-icon-theme deps (because of post/postun scripts)

---- Files affected:
SPECS:
   vim.spec (1.376 -> 1.377) 

---- Diffs:

================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.376 SPECS/vim.spec:1.377

--- SPECS/vim.spec:1.376	Sun Aug 27 08:12:42 2006
+++ SPECS/vim.spec	Wed Oct  4 01:45:04 2006
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-# - separate vim-spell-en
 # - some nice icon
 # - bonobo patches need update
 #
@@ -11,7 +10,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)
@@ -444,6 +443,18 @@
 đÁËĹÔ 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
@@ -503,6 +514,7 @@
 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
@@ -532,6 +544,7 @@
 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
@@ -938,7 +951,10 @@
 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
@@ -960,9 +976,10 @@
 %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
 
@@ -980,9 +997,6 @@
 
 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}}
@@ -1027,13 +1041,33 @@
 
 %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}
@@ -1041,7 +1075,6 @@
 %endif
 %defattr(644,root,root,755)
 %attr(755,root,root) /bin/*
-
 %{_mandir}/man1/vi.1*
 %{_mandir}/man1/ex.1*
 %{_mandir}/man1/view.1*
@@ -1163,7 +1196,6 @@
 
 %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.*
 
@@ -1178,24 +1210,29 @@
 %{_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)
@@ -1214,17 +1251,24 @@
 %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
 
@@ -1249,6 +1293,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.377  2006/10/03 23:45:04  qboosh
+- added evim,eview,vimdiff,gvimdiff symlinks
+- more man packaging fixes
+- separated -spell-en
+- hicolor-icon-theme deps (because of post/postun scripts)
+
 Revision 1.376  2006/08/27 06:12:42  adamg
 - 7.0.057 and 7.0.065 patches are not needed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/vim.spec?r1=1.376&r2=1.377&f=u

